diff -Nru qemu-8.0.4+dfsg/debian/changelog qemu-8.0.4+dfsg/debian/changelog --- qemu-8.0.4+dfsg/debian/changelog 2024-03-18 23:40:04.000000000 +0000 +++ qemu-8.0.4+dfsg/debian/changelog 2024-03-25 18:54:06.000000000 +0000 @@ -1,3 +1,10 @@ +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 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 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 2024-03-18 23:40:04.000000000 +0000 +++ qemu-8.0.4+dfsg/debian/patches/ubuntu/lp2012763-maxcpus-too-low.patch 2024-03-25 18:52:39.000000000 +0000 @@ -1,5 +1,5 @@ ---- qemu-maxcpus-mantic.orig/hw/i386/pc_q35.c 2024-03-18 19:42:02.733177294 -0400 -+++ qemu-maxcpus-mantic/hw/i386/pc_q35.c 2024-03-18 19:45:20.202653527 -0400 +--- 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); @@ -25,7 +25,7 @@ static void pc_q35_kinetic_machine_options(MachineClass *m) { pc_q35_7_0_machine_options(m); -@@ -936,3 +954,20 @@ static void pc_q35_mantic_hpb_machine_op +@@ -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); @@ -35,6 +35,7 @@ + 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); @@ -43,11 +44,12 @@ +{ + 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-18 19:42:02.733177294 -0400 -+++ qemu-maxcpus-mantic/hw/i386/pc_piix.c 2024-03-18 19:46:29.081847603 -0400 +--- 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);