Merge ~sergiodj/ubuntu/+source/qemu:remove-hpb-noble into ubuntu/+source/qemu:ubuntu/devel

[Sergio Durigan Junior]

This MP removes the -hpb (host-physical-bits) machine types for Noble, now that OpenStack doesn't need them anymore.

For more context on why we have been adding these specific machine types, see bug #1776189.

For context on why it is now OK to remove the Noble -hpb machine types, see bug #2045592.

Note that from Noble onward we will not add -hpb types for future Ubuntu releases, but the existing -hpb types will be kept as they are in order to guarantee smooth live migrations.

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

dep8 results will be posted as soon as I have them.

[Sergio Durigan Junior (sergiodj)]

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-noble-sergiodj-qemu/?format=plain)
  qemu @ amd64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-noble-sergiodj-qemu/noble/amd64/q/qemu/20231205_051635_9c570@/log.gz
    05.12.23 05:16:35 ✅ Triggers: qemu/1:8.1.3+ds-1ubuntu2~ppa1
  qemu @ ppc64el:
    http://autopkgtest.ubuntu.com/results/autopkgtest-noble-sergiodj-qemu/noble/ppc64el/q/qemu/20231205_045846_e7706@/log.gz
    05.12.23 04:58:46 ✅ Triggers: qemu/1:8.1.3+ds-1ubuntu2~ppa1
  qemu @ s390x:
    http://autopkgtest.ubuntu.com/results/autopkgtest-noble-sergiodj-qemu/noble/s390x/q/qemu/20231205_045738_7e92e@/log.gz
    05.12.23 04:57:38 ✅ Triggers: qemu/1:8.1.3+ds-1ubuntu2~ppa1

[Bryce Harrington (bryce)]

The code changes look correct, and I've reviewed and studied the bug history. Build and test results all pass successfully. The change has been planned since comment #17 on LP: #1776189 and #27 on LP: #1769053.

LGTM, +1

review: Approve

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

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

review: Approve

[Sergio Durigan Junior (sergiodj)]

On Tuesday, December 05 2023, Bryce Harrington wrote:

> The code changes look correct, and I've reviewed and studied the bug history. Build and test results all pass successfully. The change has been planned since comment #17 on LP: #1776189 and #27 on LP: #1769053.
>
> LGTM, +1

Thanks, Bryce.

Uploaded:

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

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

diff --git a/debian/changelog b/debian/changelog
index 40d8d0e..9bffa11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qemu (1:8.1.3+ds-1ubuntu2) noble; urgency=medium
+
+  * d/p/u/define-ubuntu-machine-types.patch: Remove -hpb Noble machine
+    types, as they are not needed by OpenStack anymore. (LP: #2045592)
+
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 04 Dec 2023 16:44:44 -0500
+
 qemu (1:8.1.3+ds-1ubuntu1) noble; urgency=medium
 
   * Merge with Debian unstable (LP: #2044425, #2039700). Remaining changes:
diff --git a/debian/patches/ubuntu/define-ubuntu-machine-types.patch b/debian/patches/ubuntu/define-ubuntu-machine-types.patch
index 0be824d..336a231 100644
--- a/debian/patches/ubuntu/define-ubuntu-machine-types.patch
+++ b/debian/patches/ubuntu/define-ubuntu-machine-types.patch
@@ -107,9 +107,9 @@ Forward-info: downstream decision
 
 Index: qemu/hw/i386/pc_piix.c
 ===================================================================
---- qemu.orig/hw/i386/pc_piix.c	2023-11-21 20:45:15.806755599 -0500
-+++ qemu/hw/i386/pc_piix.c	2023-11-21 22:21:00.401852388 -0500
-@@ -508,11 +508,7 @@
+--- qemu.orig/hw/i386/pc_piix.c	2023-12-04 16:34:41.242907089 -0500
++++ qemu/hw/i386/pc_piix.c	2023-12-04 16:42:23.529009860 -0500
+@@ -507,11 +507,7 @@
  {
      pc_i440fx_machine_options(m);
      m->alias = "pc";
@@ -121,7 +121,7 @@ Index: qemu/hw/i386/pc_piix.c
  }
  
  DEFINE_I440FX_MACHINE(v8_1, "pc-i440fx-8.1", NULL,
-@@ -968,3 +964,345 @@
+@@ -967,3 +963,341 @@
  DEFINE_PC_MACHINE(xenfv, "xenfv-3.1", pc_xen_hvm_init,
                    xenfv_3_1_machine_options);
  #endif
@@ -417,16 +417,12 @@ Index: qemu/hw/i386/pc_piix.c
 +DEFINE_I440FX_MACHINE(noble, "pc-i440fx-noble", NULL,
 +                      pc_noble_machine_options);
 +
-+static void pc_noble_hpb_machine_options(MachineClass *m)
-+{
-+    pc_i440fx_8_1_machine_options(m);
-+    m->desc = "Ubuntu 24.04 PC (i440FX + PIIX +host-phys-bits=true, 1996)";
-+    m->alias = NULL;
-+    compat_props_add(m->compat_props,
-+        host_phys_bits_compat, host_phys_bits_compat_len);
-+}
-+DEFINE_I440FX_MACHINE(noble_hpb, "pc-i440fx-noble-hpb", NULL,
-+                      pc_noble_hpb_machine_options);
++/* Ubuntu: From Noble onwards, we do not add the -hpb machine variants
++ * because they are not needed by OpenStack anymore.  For more information, see:
++ *
++ * https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1769053
++ * https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/2045592
++ */
 +
 +/*
 + * Due to bug 1621042 we have to consider the broken old wily machine
@@ -469,9 +465,9 @@ Index: qemu/hw/i386/pc_piix.c
 +                      pc_wily_machine_options);
 Index: qemu/hw/i386/pc_q35.c
 ===================================================================
---- qemu.orig/hw/i386/pc_q35.c	2023-11-21 20:45:15.806755599 -0500
-+++ qemu/hw/i386/pc_q35.c	2023-11-21 22:22:38.365121869 -0500
-@@ -681,3 +681,297 @@
+--- qemu.orig/hw/i386/pc_q35.c	2023-12-04 16:34:41.242907089 -0500
++++ qemu/hw/i386/pc_q35.c	2023-12-04 16:43:00.296618751 -0500
+@@ -681,3 +681,293 @@
  
  DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL,
                     pc_q35_2_4_machine_options);
@@ -759,20 +755,16 @@ Index: qemu/hw/i386/pc_q35.c
 +DEFINE_Q35_MACHINE(noble, "pc-q35-noble", NULL,
 +                   pc_q35_noble_machine_options);
 +
-+static void pc_q35_noble_hpb_machine_options(MachineClass *m)
-+{
-+    pc_q35_noble_machine_options(m);
-+    m->desc = "Ubuntu 24.04 PC (Q35 + ICH9, +host-phys-bits=true, 2009)";
-+    m->alias = NULL;
-+    compat_props_add(m->compat_props,
-+        host_phys_bits_compat, host_phys_bits_compat_len);
-+}
-+DEFINE_Q35_MACHINE(noble_hpb, "pc-q35-noble-hpb", NULL,
-+                   pc_q35_noble_hpb_machine_options);
++/* Ubuntu: From Noble onwards, we do not add the -hpb machine variants
++ * because they are not needed by OpenStack anymore.  For more information, see:
++ *
++ * https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1769053
++ * https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/2045592
++ */
 Index: qemu/hw/ppc/spapr.c
 ===================================================================
---- qemu.orig/hw/ppc/spapr.c	2023-11-21 20:45:15.806755599 -0500
-+++ qemu/hw/ppc/spapr.c	2023-11-21 22:15:25.384325850 -0500
+--- qemu.orig/hw/ppc/spapr.c	2023-12-04 16:34:41.242907089 -0500
++++ qemu/hw/ppc/spapr.c	2023-12-04 16:34:41.238907151 -0500
 @@ -4732,11 +4732,14 @@
  }
  
@@ -856,8 +848,8 @@ Index: qemu/hw/ppc/spapr.c
      type_register_static(&spapr_machine_info);
 Index: qemu/hw/s390x/s390-virtio-ccw.c
 ===================================================================
---- qemu.orig/hw/s390x/s390-virtio-ccw.c	2023-11-21 20:45:15.806755599 -0500
-+++ qemu/hw/s390x/s390-virtio-ccw.c	2023-11-21 22:18:03.843161573 -0500
+--- qemu.orig/hw/s390x/s390-virtio-ccw.c	2023-12-04 16:34:41.242907089 -0500
++++ qemu/hw/s390x/s390-virtio-ccw.c	2023-12-04 16:34:48.000000000 -0500
 @@ -800,12 +800,15 @@
  }
  
@@ -922,8 +914,8 @@ Index: qemu/hw/s390x/s390-virtio-ccw.c
      type_register_static(&ccw_machine_info);
 Index: qemu/hw/i386/pc.c
 ===================================================================
---- qemu.orig/hw/i386/pc.c	2023-11-21 20:45:15.806755599 -0500
-+++ qemu/hw/i386/pc.c	2023-11-21 20:45:15.806755599 -0500
+--- qemu.orig/hw/i386/pc.c	2023-12-04 16:34:41.242907089 -0500
++++ qemu/hw/i386/pc.c	2023-12-04 16:34:41.238907151 -0500
 @@ -179,6 +179,11 @@
  GlobalProperty pc_compat_4_0[] = {};
  const size_t pc_compat_4_0_len = G_N_ELEMENTS(pc_compat_4_0);
@@ -938,8 +930,8 @@ Index: qemu/hw/i386/pc.c
      { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" },
 Index: qemu/include/hw/i386/pc.h
 ===================================================================
---- qemu.orig/include/hw/i386/pc.h	2023-11-21 20:45:15.806755599 -0500
-+++ qemu/include/hw/i386/pc.h	2023-11-21 20:45:15.806755599 -0500
+--- qemu.orig/include/hw/i386/pc.h	2023-12-04 16:34:41.242907089 -0500
++++ qemu/include/hw/i386/pc.h	2023-12-04 16:34:41.238907151 -0500
 @@ -239,6 +239,9 @@
  extern GlobalProperty pc_compat_4_0[];
  extern const size_t pc_compat_4_0_len;
@@ -952,8 +944,8 @@ Index: qemu/include/hw/i386/pc.h
  
 Index: qemu/hw/core/machine.c
 ===================================================================
---- qemu.orig/hw/core/machine.c	2023-11-21 20:45:15.806755599 -0500
-+++ qemu/hw/core/machine.c	2023-11-21 20:45:15.806755599 -0500
+--- qemu.orig/hw/core/machine.c	2023-12-04 16:34:41.242907089 -0500
++++ qemu/hw/core/machine.c	2023-12-04 16:34:51.000000000 -0500
 @@ -245,17 +245,29 @@
  };
  const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5);
@@ -993,8 +985,8 @@ Index: qemu/hw/core/machine.c
      { "virtio-balloon-pci", "any_layout", "off" },
 Index: qemu/include/hw/boards.h
 ===================================================================
---- qemu.orig/include/hw/boards.h	2023-11-21 20:45:15.806755599 -0500
-+++ qemu/include/hw/boards.h	2023-11-21 20:45:15.806755599 -0500
+--- qemu.orig/include/hw/boards.h	2023-12-04 16:34:41.242907089 -0500
++++ qemu/include/hw/boards.h	2023-12-04 16:34:41.238907151 -0500
 @@ -462,6 +462,10 @@
  extern GlobalProperty hw_compat_2_4[];
  extern const size_t hw_compat_2_4_len;