diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-06-23 06:28:08 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-06-26 09:39:40 -0400 |
| commit | f983ff95f4c9886eaa4c59beff609d59fa2a90ff (patch) | |
| tree | d1a455f6e68b2415bfe2a2d6d9a396cf443b84e1 /hw/core | |
| parent | 8f06f22f38246ea7a6b0b20013fd9a7a87e23569 (diff) | |
| download | qemu-f983ff95f4c9886eaa4c59beff609d59fa2a90ff.zip qemu-f983ff95f4c9886eaa4c59beff609d59fa2a90ff.tar.gz qemu-f983ff95f4c9886eaa4c59beff609d59fa2a90ff.tar.bz2 | |
vmport: move compat properties to hw_compat_5_0
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.
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")
Reported-by: Laurent Vivier <lvivier@redhat.com>
Cc: Liran Alon <liran.alon@oracle.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/core')
| -rw-r--r-- | hw/core/machine.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index 1d80ab0..211b4e0 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); |