Merge ~sergiodj/ubuntu/+source/qemu:max-cpu-too-low-mantic into ubuntu/+source/qemu:ubuntu/mantic-devel

[Sergio Durigan Junior]

This MP implements is the "forwardport" of https://code.launchpad.net/~sergiodj/ubuntu/+source/qemu/+git/qemu/+merge/454078 for Mantic, as well as its own machine type for maxcpus.

Please refer to that MP for more details.

PPA: https://launchpad.net/~sergiodj/+archive/ubuntu/qemu-bug2012763/+packages

[Andreas Hasenack (ahasenack)]

Grabbing this one.

[Andreas Hasenack (ahasenack)]

+1, compared the changes to the ones from jammy and noble, and I see the machine types are correctly transported between ubuntu releases.

There is a follow-up discussion we will have on how lxd can incorporate these changes in its embedded build of qemu, but it doesn't block this update.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: sergiodj, ahasenack
Uploaders: sergiodj, ahasenack
MP auto-approved

review: Approve

[Sergio Durigan Junior (sergiodj)]

On Thursday, March 21 2024, Andreas Hasenack wrote:

> Review: Approve
>
> +1, compared the changes to the ones from jammy and noble, and I see the machine types are correctly transported between ubuntu releases.
>
> There is a follow-up discussion we will have on how lxd can incorporate these changes in its embedded build of qemu, but it doesn't block this update.

Thanks. Uploaded:

$ dput qemu_8.0.4+dfsg-1ubuntu3.23.10.4_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/qemu/qemu_8.0.4+dfsg-1ubuntu3.23.10.4_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/qemu/qemu_8.0.4+dfsg-1ubuntu3.23.10.4.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading qemu_8.0.4+dfsg-1ubuntu3.23.10.4.dsc: done.
  Uploading qemu_8.0.4+dfsg-1ubuntu3.23.10.4.debian.tar.xz: done.
  Uploading qemu_8.0.4+dfsg-1ubuntu3.23.10.4_source.buildinfo: done.
  Uploading qemu_8.0.4+dfsg-1ubuntu3.23.10.4_source.changes: done.
Successfully uploaded packages.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

[Andreas Hasenack (ahasenack)]

This is in mantic already, marking MP as merged.

diff --git a/debian/changelog b/debian/changelog
index e055d38..69ba257 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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 <[e-mail]>  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 --git a/debian/patches/series b/debian/patches/series
index 553651c..f46d4ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,3 +39,4 @@ CVE-2023-5088.patch
 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 --git a/debian/patches/ubuntu/lp2012763-maxcpus-too-low.patch b/debian/patches/ubuntu/lp2012763-maxcpus-too-low.patch
new file mode 100644
index 0000000..a830ace
--- /dev/null
+++ b/debian/patches/ubuntu/lp2012763-maxcpus-too-low.patch
@@ -0,0 +1,100 @@
+--- 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
+@@ -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,20 @@ 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;
++}
++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)";
++}
++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
+@@ -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