diff mbox series

[v2,05/16] hw/i386/vmport: Introduce vmx-version property

Message ID 20200310165332.140774-6-liran.alon@oracle.com (mailing list archive)
State New, archived
Headers show
Series : hw/i386/vmport: Bug fixes and improvements | expand

Commit Message

Liran Alon March 10, 2020, 4:53 p.m. UTC 
In VMware terminology, VMX is the name of VMware VMM. Short for Virtual
Machine eXecutable. (Do not confuse with Intel VT-x which is also often
named VMX).

vmx-version is a number returned from CMD_GETVERSION which specifies to
guest VMware Tools the the host VMX version. If the host reports a number
that is different than what the guest VMware Tools expects, it may force
guest to upgrade VMware Tools. (See comment above VERSION_MAGIC and
VmCheck_IsVirtualWorld() function in open-vm-tools open-source code).

For better readability and allow maintaining compatability for guests
which may expect different vmx-version, make vmx-version a VMPort object
property. This would allow user to control it's value via
"-global vmport.vmx-version=X".

Reviewed-by: Nikita Leshenko <nikita.leshchenko@oracle.com>
Signed-off-by: Liran Alon <liran.alon@oracle.com>
---
 hw/i386/vmport.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c
index 8115852720c8..0d3f19b0bb71 100644
--- a/hw/i386/vmport.c
+++ b/hw/i386/vmport.c
@@ -45,6 +45,8 @@  typedef struct VMPortState {
     VMPortReadFunc *func[VMPORT_ENTRIES];
     void *opaque[VMPORT_ENTRIES];
 
+    uint32_t vmx_version;
+
     uint8_t version;
 } VMPortState;
 
@@ -123,7 +125,7 @@  static uint32_t vmport_cmd_get_version(void *opaque, uint32_t addr)
     X86CPU *cpu = X86_CPU(current_cpu);
 
     cpu->env.regs[R_EBX] = VMPORT_MAGIC;
-    return 6;
+    return port_state->vmx_version;
 }
 
 static uint32_t vmport_cmd_ram_size(void *opaque, uint32_t addr)
@@ -186,6 +188,10 @@  static Property vmport_properties[] = {
      * version and define proper version for previous machine-types.
      */
     DEFINE_PROP_UINT8("version", VMPortState, version, 2),
+
+    /* Default value taken from open-vm-tools code VERSION_MAGIC definition */
+    DEFINE_PROP_UINT32("vmx-version", VMPortState, vmx_version, 6),
+
     DEFINE_PROP_END_OF_LIST(),
 };