diff -Nru qemu-8.0.4+dfsg/debian/changelog qemu-8.0.4+dfsg/debian/changelog
--- qemu-8.0.4+dfsg/debian/changelog	2024-02-13 23:26:17.000000000 +0000
+++ qemu-8.0.4+dfsg/debian/changelog	2024-03-25 18:54:06.000000000 +0000
@@ -1,3 +1,17 @@
+qemu (1:8.0.4+dfsg-1ubuntu3.23.10.5) mantic; urgency=medium
+
+  * d/p/u/lp2012763-maxcpus-too-low.patch: Actually set the max_cpus
+    property of the new Mantic machine types. (LP: #2012763)
+
+ -- Sergio Durigan Junior <sergio.durigan@canonical.com>  Mon, 25 Mar 2024 14:54:06 -0400
+
+qemu (1:8.0.4+dfsg-1ubuntu3.23.10.4) mantic; urgency=medium
+
+  * d/p/u/lp2012763-maxcpus-too-low.patch: Bump max_cpus to 1024 on
+    amd64.  (LP: #2012763)
+
+ -- Sergio Durigan Junior <sergio.durigan@canonical.com>  Mon, 18 Mar 2024 19:40:04 -0400
+
 qemu (1:8.0.4+dfsg-1ubuntu3.23.10.3) mantic; urgency=medium
 
   * d/p/u/lp-2051965-*.patch: Fix QEMU crash when using TCG acceleration
diff -Nru qemu-8.0.4+dfsg/debian/patches/series qemu-8.0.4+dfsg/debian/patches/series
--- qemu-8.0.4+dfsg/debian/patches/series	2024-02-13 23:26:17.000000000 +0000
+++ qemu-8.0.4+dfsg/debian/patches/series	2024-03-18 23:33:05.000000000 +0000
@@ -39,3 +39,4 @@
 ubuntu/lp-2051965-accel-tcg-Split-out-cpu_exec_longjmp_cleanup.patch
 ubuntu/lp-2051965-accel-tcg-Always-lock-pages-before-translation.patch
 ubuntu/lp-2051965-accel-tcg-Clear-tcg_ctx-gen_tb-on-buffer-overflow.patch
+ubuntu/lp2012763-maxcpus-too-low.patch
diff -Nru qemu-8.0.4+dfsg/debian/patches/ubuntu/lp2012763-maxcpus-too-low.patch qemu-8.0.4+dfsg/debian/patches/ubuntu/lp2012763-maxcpus-too-low.patch
--- qemu-8.0.4+dfsg/debian/patches/ubuntu/lp2012763-maxcpus-too-low.patch	1970-01-01 00:00:00.000000000 +0000
+++ qemu-8.0.4+dfsg/debian/patches/ubuntu/lp2012763-maxcpus-too-low.patch	2024-03-25 18:52:39.000000000 +0000
@@ -0,0 +1,102 @@
+--- qemu-maxcpus-mantic.orig/hw/i386/pc_q35.c	2024-03-25 14:51:44.062725620 -0400
++++ qemu-maxcpus-mantic/hw/i386/pc_q35.c	2024-03-25 14:52:26.822243238 -0400
+@@ -877,6 +877,24 @@ static void pc_q35_jammy_hpb_machine_opt
+ DEFINE_Q35_MACHINE(jammy_hpb, "pc-q35-jammy-hpb", NULL,
+                    pc_q35_jammy_hpb_machine_options);
+ 
++static void pc_q35_jammy_maxcpus_machine_options(MachineClass *m)
++{
++    pc_q35_jammy_machine_options(m);
++    m->desc = "Ubuntu 22.04 PC (Q35 + ICH9, maxcpus=1024, 2009)";
++    m->max_cpus = 1024;
++}
++DEFINE_Q35_MACHINE(jammy_maxcpus, "pc-q35-jammy-maxcpus", NULL,
++                   pc_q35_jammy_maxcpus_machine_options);
++
++static void pc_q35_jammy_hpb_maxcpus_machine_options(MachineClass *m)
++{
++    pc_q35_jammy_hpb_machine_options(m);
++    m->desc = "Ubuntu 22.04 PC (Q35 + ICH9, +host-phys-bits=true, maxcpus=1024, 2009)";
++    m->max_cpus = 1024;
++}
++DEFINE_Q35_MACHINE(jammy_hpb_maxcpus, "pc-q35-jammy-hpb-maxcpus", NULL,
++                   pc_q35_jammy_hpb_maxcpus_machine_options);
++
+ static void pc_q35_kinetic_machine_options(MachineClass *m)
+ {
+     pc_q35_7_0_machine_options(m);
+@@ -936,3 +954,22 @@ static void pc_q35_mantic_hpb_machine_op
+ }
+ DEFINE_Q35_MACHINE(mantic_hpb, "pc-q35-mantic-hpb", NULL,
+                    pc_q35_mantic_hpb_machine_options);
++
++static void pc_q35_mantic_maxcpus_machine_options(MachineClass *m)
++{
++    pc_q35_mantic_machine_options(m);
++    m->desc = "Ubuntu 23.10 PC (Q35 + ICH9, maxcpus=1024, 2009)";
++    m->alias = NULL;
++    m->max_cpus = 1024;
++}
++DEFINE_Q35_MACHINE(mantic_maxcpus, "pc-q35-mantic-maxcpus", NULL,
++                   pc_q35_mantic_maxcpus_machine_options);
++
++static void pc_q35_mantic_hpb_maxcpus_machine_options(MachineClass *m)
++{
++    pc_q35_mantic_hpb_machine_options(m);
++    m->desc = "Ubuntu 23.10 PC (Q35 + ICH9, +host-phys-bits=true, maxcpus=1024, 2009)";
++    m->max_cpus = 1024;
++}
++DEFINE_Q35_MACHINE(mantic_hpb_maxcpus, "pc-q35-mantic-hpb-maxcpus", NULL,
++                   pc_q35_mantic_hpb_maxcpus_machine_options);
+--- qemu-maxcpus-mantic.orig/hw/i386/pc_piix.c	2024-03-25 14:51:44.062725620 -0400
++++ qemu-maxcpus-mantic/hw/i386/pc_piix.c	2024-03-25 14:51:44.062725620 -0400
+@@ -1114,6 +1114,24 @@ static void pc_jammy_hpb_machine_options
+ DEFINE_I440FX_MACHINE(jammy_hpb, "pc-i440fx-jammy-hpb", NULL,
+                       pc_jammy_hpb_machine_options);
+ 
++static void pc_jammy_maxcpus_machine_options(MachineClass *m)
++{
++    pc_jammy_machine_options(m);
++    m->desc = "Ubuntu 22.04 PC (i440FX + PIIX, maxcpus=1024, 1996)";
++    m->alias = NULL;
++    m->max_cpus = 1024;
++}
++DEFINE_I440FX_MACHINE(jammy_maxcpus, "pc-i440fx-jammy-maxcpus", NULL,
++                      pc_jammy_maxcpus_machine_options);
++
++static void pc_jammy_hpb_maxcpus_machine_options(MachineClass *m)
++{
++    pc_jammy_hpb_machine_options(m);
++    m->desc = "Ubuntu 22.04 PC (i440FX + PIIX +host-phys-bits=true, maxcpus=1024, 1996)";
++}
++DEFINE_I440FX_MACHINE(jammy_hpb_maxcpus, "pc-i440fx-jammy-hpb-maxcpus", NULL,
++                      pc_jammy_hpb_maxcpus_machine_options);
++
+ static void pc_kinetic_machine_options(MachineClass *m)
+ {
+     pc_i440fx_7_0_machine_options(m);
+@@ -1179,6 +1197,24 @@ static void pc_mantic_hpb_machine_option
+ DEFINE_I440FX_MACHINE(mantic_hpb, "pc-i440fx-mantic-hpb", NULL,
+                       pc_mantic_hpb_machine_options);
+ 
++static void pc_mantic_maxcpus_machine_options(MachineClass *m)
++{
++    pc_mantic_machine_options(m);
++    m->desc = "Ubuntu 23.10 PC (i440FX + PIIX, maxcpus=1024, 1996)";
++    m->alias = NULL;
++    m->is_default = false;
++}
++DEFINE_I440FX_MACHINE(mantic_maxcpus, "pc-i440fx-mantic-maxcpus", NULL,
++                      pc_mantic_maxcpus_machine_options);
++
++static void pc_mantic_hpb_maxcpus_machine_options(MachineClass *m)
++{
++    pc_mantic_hpb_machine_options(m);
++    m->desc = "Ubuntu 23.10 PC (i440FX + PIIX +host-phys-bits=true, maxcpus=1024, 1996)";
++}
++DEFINE_I440FX_MACHINE(mantic_hpb_maxcpus, "pc-i440fx-mantic-hpb-maxcpus", NULL,
++                      pc_mantic_hpb_maxcpus_machine_options);
++
+ /*
+  * Due to bug 1621042 we have to consider the broken old wily machine
+  * type as valid xenial type to ensure older VMs that got created prio