Merge ~paelzer/ubuntu/+source/qemu:lp-1902654-broken-wily-type-GROOVY into ubuntu/+source/qemu:ubuntu/groovy-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/debug-qemu-4.2/+packages

[Lucas Kanashiro (lucaskanashiro)]

The comments I made to Hirsute's MP apply to this one as well.

review: Approve

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/qemu
 * [new tag] upload/1%5.0-5ubuntu9.1 -> upload/1%5.0-5ubuntu9.1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading qemu_5.0-5ubuntu9.1.dsc: done.
  Uploading qemu_5.0-5ubuntu9.1.debian.tar.xz: done.
  Uploading qemu_5.0-5ubuntu9.1_source.buildinfo: done.
  Uploading qemu_5.0-5ubuntu9.1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 1d90fbf..d32902b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qemu (1:5.0-5ubuntu9.1) groovy; urgency=medium
+
+  * d/p/ubuntu/define-ubuntu-machine-types.patch: update to fix 15.04 wily
+    machine type to match how it originally was released (LP: #1902654)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 09 Nov 2020 08:19:07 +0100
+
 qemu (1:5.0-5ubuntu9) groovy; urgency=medium
 
   * d/p/u/usb-fix-setup_len-init-CVE-2020-14364.patch: sanity check usb
diff --git a/debian/patches/ubuntu/define-ubuntu-machine-types.patch b/debian/patches/ubuntu/define-ubuntu-machine-types.patch
index d236b4f..056fd12 100644
--- a/debian/patches/ubuntu/define-ubuntu-machine-types.patch
+++ b/debian/patches/ubuntu/define-ubuntu-machine-types.patch
@@ -110,7 +110,7 @@ Forward-info: downstream decision
      pcmc->default_cpu_version = 1;
  }
  
-@@ -975,3 +970,199 @@ static void xenfv_3_1_machine_options(Ma
+@@ -975,3 +970,204 @@ static void xenfv_3_1_machine_options(Ma
  DEFINE_PC_MACHINE(xenfv, "xenfv-3.1", pc_xen_hvm_init,
                    xenfv_3_1_machine_options);
  #endif
@@ -289,15 +289,20 @@ Forward-info: downstream decision
 + * moving between those version references.
 + * This introduces pc_i440fx_wily_machine_options which encapsulates the
 + * old behavior as it was (this is the purpose of machine types).
++ *
++ * Further bug 1902654 identified issues due to the upstream rework of types
++ * that made the wily type change some attributes in >=Eoan.
++ * As we did in Bionic for 1829868 we need to use a 2_4/2_3 hybrid type to
++ * match what was initially shipped.
 + */
 +static void pc_i440fx_wily_machine_options(MachineClass *m)
 +{
 +    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
-+    pc_i440fx_2_4_machine_options(m);
++    pc_i440fx_2_5_machine_options(m);
 +    m->hw_version = "2.4.0";
 +    pcmc->broken_reserved_end = true;
-+    compat_props_add(m->compat_props, hw_compat_2_3, hw_compat_2_3_len);
-+    compat_props_add(m->compat_props, pc_compat_2_3, pc_compat_2_3_len);
++    compat_props_add(m->compat_props, hw_compat_2_4_wily, hw_compat_2_4_wily_len);
++    compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len);
 +}
 +
 +static void pc_wily_machine_options(MachineClass *m)
@@ -682,3 +687,55 @@ Forward-info: downstream decision
  extern GlobalProperty pc_compat_3_1[];
  extern const size_t pc_compat_3_1_len;
  
+--- a/hw/core/machine.c
++++ b/hw/core/machine.c
+@@ -153,17 +153,29 @@ GlobalProperty hw_compat_2_5[] = {
+ };
+ const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5);
+ 
++#define HW_COMPAT_2_4_DEFS \
++    /* Optional because the 'scsi' property is Linux-only */ \
++    { "virtio-blk-device", "scsi", "true", .optional = true }, \
++    { "e1000", "extra_mac_registers", "off" }, \
++    { "virtio-pci", "x-disable-pcie", "on" }, \
++    { "virtio-pci", "migrate-extra", "off" }, \
++    { "fw_cfg_mem", "dma_enabled", "off" }, \
++    { "fw_cfg_io", "dma_enabled", "off" }, \
++
+ GlobalProperty hw_compat_2_4[] = {
+-    /* Optional because the 'scsi' property is Linux-only */
+-    { "virtio-blk-device", "scsi", "true", .optional = true },
+-    { "e1000", "extra_mac_registers", "off" },
+-    { "virtio-pci", "x-disable-pcie", "on" },
+-    { "virtio-pci", "migrate-extra", "off" },
+-    { "fw_cfg_mem", "dma_enabled", "off" },
+-    { "fw_cfg_io", "dma_enabled", "off" }
++    HW_COMPAT_2_4_DEFS
+ };
+ const size_t hw_compat_2_4_len = G_N_ELEMENTS(hw_compat_2_4);
+ 
++// workaround for bug 1902654 / 1829868, see pc_i440fx_wily_machine_options in hw/i386/pc_piix.c
++GlobalProperty hw_compat_2_4_wily[] = {
++    HW_COMPAT_2_4_DEFS
++    { "migration", "send-configuration", "off" },
++    { "migration", "send-section-footer", "off" },
++    { "migration", "store-global-state", "off" },
++};
++const size_t hw_compat_2_4_wily_len = G_N_ELEMENTS(hw_compat_2_4_wily);
++
+ GlobalProperty hw_compat_2_3[] = {
+     { "virtio-blk-pci", "any_layout", "off" },
+     { "virtio-balloon-pci", "any_layout", "off" },
+--- a/include/hw/boards.h
++++ b/include/hw/boards.h
+@@ -360,6 +360,10 @@ extern const size_t hw_compat_2_5_len;
+ extern GlobalProperty hw_compat_2_4[];
+ extern const size_t hw_compat_2_4_len;
+ 
++// workaround for bug 1902654 / 1829868, see pc_i440fx_wily_machine_options in hw/i386/pc_piix.c
++extern GlobalProperty hw_compat_2_4_wily[];
++extern const size_t hw_compat_2_4_wily_len;
++
+ extern GlobalProperty hw_compat_2_3[];
+ extern const size_t hw_compat_2_3_len;
+