Ubuntu
qemu package

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

  1. Git
  2. lp:~sergiodj/ubuntu/+source/qemu
  3. max-cpu-too-low-mantic
  4. Merge into ubuntu/mantic-devel
Proposed by Sergio Durigan Junior
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merge reported by: Andreas Hasenack
Merged at revision: 8ae39ce56d33682814266913235b1e6b6ea28fb6
Proposed branch: ~sergiodj/ubuntu/+source/qemu:max-cpu-too-low-mantic
Merge into: ubuntu/+source/qemu:ubuntu/mantic-devel
Diff against target: 130 lines (+108/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/series (+1/-0)
debian/patches/ubuntu/lp2012763-maxcpus-too-low.patch (+100/-0)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Andreas Hasenack Approve
Canonical Server Reporter Pending
Review via email: mp+462643@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Grabbing this one.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

+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
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

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

review: Approve
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

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

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

This is in mantic already, marking MP as merged.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index e055d38..69ba257 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1qemu (1:8.0.4+dfsg-1ubuntu3.23.10.4) mantic; urgency=medium
2
3 * d/p/u/lp2012763-maxcpus-too-low.patch: Bump max_cpus to 1024 on
4 amd64. (LP: #2012763)
5
6 -- Sergio Durigan Junior <sergio.durigan@canonical.com> Mon, 18 Mar 2024 19:40:04 -0400
7
1qemu (1:8.0.4+dfsg-1ubuntu3.23.10.3) mantic; urgency=medium8qemu (1:8.0.4+dfsg-1ubuntu3.23.10.3) mantic; urgency=medium
29
3 * d/p/u/lp-2051965-*.patch: Fix QEMU crash when using TCG acceleration10 * 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
39ubuntu/lp-2051965-accel-tcg-Split-out-cpu_exec_longjmp_cleanup.patch39ubuntu/lp-2051965-accel-tcg-Split-out-cpu_exec_longjmp_cleanup.patch
40ubuntu/lp-2051965-accel-tcg-Always-lock-pages-before-translation.patch40ubuntu/lp-2051965-accel-tcg-Always-lock-pages-before-translation.patch
41ubuntu/lp-2051965-accel-tcg-Clear-tcg_ctx-gen_tb-on-buffer-overflow.patch41ubuntu/lp-2051965-accel-tcg-Clear-tcg_ctx-gen_tb-on-buffer-overflow.patch
42ubuntu/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
42new file mode 10064443new file mode 100644
index 0000000..a830ace
--- /dev/null
+++ b/debian/patches/ubuntu/lp2012763-maxcpus-too-low.patch
@@ -0,0 +1,100 @@
1--- qemu-maxcpus-mantic.orig/hw/i386/pc_q35.c 2024-03-18 19:42:02.733177294 -0400
2+++ qemu-maxcpus-mantic/hw/i386/pc_q35.c 2024-03-18 19:45:20.202653527 -0400
3@@ -877,6 +877,24 @@ static void pc_q35_jammy_hpb_machine_opt
4 DEFINE_Q35_MACHINE(jammy_hpb, "pc-q35-jammy-hpb", NULL,
5 pc_q35_jammy_hpb_machine_options);
6
7+static void pc_q35_jammy_maxcpus_machine_options(MachineClass *m)
8+{
9+ pc_q35_jammy_machine_options(m);
10+ m->desc = "Ubuntu 22.04 PC (Q35 + ICH9, maxcpus=1024, 2009)";
11+ m->max_cpus = 1024;
12+}
13+DEFINE_Q35_MACHINE(jammy_maxcpus, "pc-q35-jammy-maxcpus", NULL,
14+ pc_q35_jammy_maxcpus_machine_options);
15+
16+static void pc_q35_jammy_hpb_maxcpus_machine_options(MachineClass *m)
17+{
18+ pc_q35_jammy_hpb_machine_options(m);
19+ m->desc = "Ubuntu 22.04 PC (Q35 + ICH9, +host-phys-bits=true, maxcpus=1024, 2009)";
20+ m->max_cpus = 1024;
21+}
22+DEFINE_Q35_MACHINE(jammy_hpb_maxcpus, "pc-q35-jammy-hpb-maxcpus", NULL,
23+ pc_q35_jammy_hpb_maxcpus_machine_options);
24+
25 static void pc_q35_kinetic_machine_options(MachineClass *m)
26 {
27 pc_q35_7_0_machine_options(m);
28@@ -936,3 +954,20 @@ static void pc_q35_mantic_hpb_machine_op
29 }
30 DEFINE_Q35_MACHINE(mantic_hpb, "pc-q35-mantic-hpb", NULL,
31 pc_q35_mantic_hpb_machine_options);
32+
33+static void pc_q35_mantic_maxcpus_machine_options(MachineClass *m)
34+{
35+ pc_q35_mantic_machine_options(m);
36+ m->desc = "Ubuntu 23.10 PC (Q35 + ICH9, maxcpus=1024, 2009)";
37+ m->alias = NULL;
38+}
39+DEFINE_Q35_MACHINE(mantic_maxcpus, "pc-q35-mantic-maxcpus", NULL,
40+ pc_q35_mantic_maxcpus_machine_options);
41+
42+static void pc_q35_mantic_hpb_maxcpus_machine_options(MachineClass *m)
43+{
44+ pc_q35_mantic_hpb_machine_options(m);
45+ m->desc = "Ubuntu 23.10 PC (Q35 + ICH9, +host-phys-bits=true, maxcpus=1024, 2009)";
46+}
47+DEFINE_Q35_MACHINE(mantic_hpb_maxcpus, "pc-q35-mantic-hpb-maxcpus", NULL,
48+ pc_q35_mantic_hpb_maxcpus_machine_options);
49--- qemu-maxcpus-mantic.orig/hw/i386/pc_piix.c 2024-03-18 19:42:02.733177294 -0400
50+++ qemu-maxcpus-mantic/hw/i386/pc_piix.c 2024-03-18 19:46:29.081847603 -0400
51@@ -1114,6 +1114,24 @@ static void pc_jammy_hpb_machine_options
52 DEFINE_I440FX_MACHINE(jammy_hpb, "pc-i440fx-jammy-hpb", NULL,
53 pc_jammy_hpb_machine_options);
54
55+static void pc_jammy_maxcpus_machine_options(MachineClass *m)
56+{
57+ pc_jammy_machine_options(m);
58+ m->desc = "Ubuntu 22.04 PC (i440FX + PIIX, maxcpus=1024, 1996)";
59+ m->alias = NULL;
60+ m->max_cpus = 1024;
61+}
62+DEFINE_I440FX_MACHINE(jammy_maxcpus, "pc-i440fx-jammy-maxcpus", NULL,
63+ pc_jammy_maxcpus_machine_options);
64+
65+static void pc_jammy_hpb_maxcpus_machine_options(MachineClass *m)
66+{
67+ pc_jammy_hpb_machine_options(m);
68+ m->desc = "Ubuntu 22.04 PC (i440FX + PIIX +host-phys-bits=true, maxcpus=1024, 1996)";
69+}
70+DEFINE_I440FX_MACHINE(jammy_hpb_maxcpus, "pc-i440fx-jammy-hpb-maxcpus", NULL,
71+ pc_jammy_hpb_maxcpus_machine_options);
72+
73 static void pc_kinetic_machine_options(MachineClass *m)
74 {
75 pc_i440fx_7_0_machine_options(m);
76@@ -1179,6 +1197,24 @@ static void pc_mantic_hpb_machine_option
77 DEFINE_I440FX_MACHINE(mantic_hpb, "pc-i440fx-mantic-hpb", NULL,
78 pc_mantic_hpb_machine_options);
79
80+static void pc_mantic_maxcpus_machine_options(MachineClass *m)
81+{
82+ pc_mantic_machine_options(m);
83+ m->desc = "Ubuntu 23.10 PC (i440FX + PIIX, maxcpus=1024, 1996)";
84+ m->alias = NULL;
85+ m->is_default = false;
86+}
87+DEFINE_I440FX_MACHINE(mantic_maxcpus, "pc-i440fx-mantic-maxcpus", NULL,
88+ pc_mantic_maxcpus_machine_options);
89+
90+static void pc_mantic_hpb_maxcpus_machine_options(MachineClass *m)
91+{
92+ pc_mantic_hpb_machine_options(m);
93+ m->desc = "Ubuntu 23.10 PC (i440FX + PIIX +host-phys-bits=true, maxcpus=1024, 1996)";
94+}
95+DEFINE_I440FX_MACHINE(mantic_hpb_maxcpus, "pc-i440fx-mantic-hpb-maxcpus", NULL,
96+ pc_mantic_hpb_maxcpus_machine_options);
97+
98 /*
99 * Due to bug 1621042 we have to consider the broken old wily machine
100 * type as valid xenial type to ensure older VMs that got created prio

Subscribers

People subscribed via source and target branches