Re: [PATCH] vmport: move compat properties to hw_compat_5_0

[Liran Alon]

On 23/06/2020 13:28, Paolo Bonzini wrote:

The patches that introduced the properties were submitted when QEMU 5.0
had not been released yet, so they got merged under the wrong heading.
Move them to hw_compat_5_0 so that 5.0 machine types get the pre-patch
behavior.

Reported-by: Laurent Vivier <lviv...@redhat.com>
Cc: Liran Alon <liran.a...@oracle.com>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>

Reviewed-by: Liran Alon <liran.a...@oracle.com>

---
  hw/core/machine.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/core/machine.c b/hw/core/machine.c
index 1d80ab0e1d..211b4e077a 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -30,6 +30,10 @@

GlobalProperty hw_compat_5_0[] = {

      { "virtio-balloon-device", "page-poison", "false" },
+    { "vmport", "x-read-set-eax", "off" },
+    { "vmport", "x-signal-unsupported-cmd", "off" },
+    { "vmport", "x-report-vmx-type", "off" },
+    { "vmport", "x-cmds-v2", "off" },
  };
  const size_t hw_compat_5_0_len = G_N_ELEMENTS(hw_compat_5_0);

@@ -45,10 +49,6 @@ GlobalProperty hw_compat_4_2[] = {

      { "qxl", "revision", "4" },
      { "qxl-vga", "revision", "4" },
      { "fw_cfg", "acpi-mr-restore", "false" },
-    { "vmport", "x-read-set-eax", "off" },
-    { "vmport", "x-signal-unsupported-cmd", "off" },
-    { "vmport", "x-report-vmx-type", "off" },
-    { "vmport", "x-cmds-v2", "off" },
  };
  const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2);