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 
Cc: Liran Alon 
Signed-off-by: Paolo Bonzini 

Reviewed-by: Liran Alon 

---
  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);
  

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

[Laurent Vivier]

On 23/06/2020 12: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 
> Cc: Liran Alon 
> Signed-off-by: Paolo Bonzini 

Fixes: b889212973da ("hw/i386/vmport: Propagate IOPort read to vCPU EAX
register")
Fixes: 0342ee761ef2 ("hw/i386/vmport: Set EAX to -1 on failed and
unsupported commands")
Fixes: f8bdc550370f ("hw/i386/vmport: Report vmware-vmx-type in
CMD_GETVERSION")
Fixes: aaacf1c15a22 ("hw/i386/vmport: Add support for CMD_GETBIOSUUID")

> ---
>  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);
>  
> 

Reviewed-by: Laurent Vivier