Skip to content

Commit f983ff9

Browse files
committed
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: b889212 ("hw/i386/vmport: Propagate IOPort read to vCPU EAX register") Fixes: 0342ee7 ("hw/i386/vmport: Set EAX to -1 on failed and unsupported commands") Fixes: f8bdc55 ("hw/i386/vmport: Report vmware-vmx-type in CMD_GETVERSION") Fixes: aaacf1c ("hw/i386/vmport: Add support for CMD_GETBIOSUUID") Reported-by: Laurent Vivier <[email protected]> Cc: Liran Alon <[email protected]> Reviewed-by: Laurent Vivier <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 8f06f22 commit f983ff9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

hw/core/machine.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030

3131
GlobalProperty hw_compat_5_0[] = {
3232
{ "virtio-balloon-device", "page-poison", "false" },
33+
{ "vmport", "x-read-set-eax", "off" },
34+
{ "vmport", "x-signal-unsupported-cmd", "off" },
35+
{ "vmport", "x-report-vmx-type", "off" },
36+
{ "vmport", "x-cmds-v2", "off" },
3337
};
3438
const size_t hw_compat_5_0_len = G_N_ELEMENTS(hw_compat_5_0);
3539

@@ -45,10 +49,6 @@ GlobalProperty hw_compat_4_2[] = {
4549
{ "qxl", "revision", "4" },
4650
{ "qxl-vga", "revision", "4" },
4751
{ "fw_cfg", "acpi-mr-restore", "false" },
48-
{ "vmport", "x-read-set-eax", "off" },
49-
{ "vmport", "x-signal-unsupported-cmd", "off" },
50-
{ "vmport", "x-report-vmx-type", "off" },
51-
{ "vmport", "x-cmds-v2", "off" },
5252
};
5353
const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2);
5454

0 commit comments

Comments
 (0)