[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 05/16] hw/i386/vmport: Introduce vmx-version property
From: |
Liran Alon |
Subject: |
[PATCH v2 05/16] hw/i386/vmport: Introduce vmx-version property |
Date: |
Tue, 10 Mar 2020 18:53:21 +0200 |
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 <address@hidden>
Signed-off-by: Liran Alon <address@hidden>
---
hw/i386/vmport.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
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(),
};
--
2.20.1
- [PATCH v2 00/16]: hw/i386/vmport: Bug fixes and improvements, Liran Alon, 2020/03/10
- [PATCH v2 01/16] hw/i386/vmport: Add device properties, Liran Alon, 2020/03/10
- [PATCH v2 02/16] hw/i386/vmport: Add compatability version field, Liran Alon, 2020/03/10
- [PATCH v2 04/16] hw/i386/vmport: Set EAX to -1 on failed and unsupported commands, Liran Alon, 2020/03/10
- [PATCH v2 03/16] hw/i386/vmport: Propagate IOPort read to vCPU EAX register, Liran Alon, 2020/03/10
- [PATCH v2 05/16] hw/i386/vmport: Introduce vmx-version property,
Liran Alon <=
- [PATCH v2 06/16] hw/i386/vmport: Report VMX type in CMD_GETVERSION, Liran Alon, 2020/03/10
- [PATCH v2 07/16] hw/i386/vmport: Introduce vmport.h, Liran Alon, 2020/03/10
- [PATCH v2 09/16] hw/i386/vmport: Add support for CMD_GETBIOSUUID, Liran Alon, 2020/03/10
- [PATCH v2 10/16] hw/i386/vmport: Add support for CMD_GETTIME, Liran Alon, 2020/03/10
- [PATCH v2 11/16] hw/i386/vmport: Add support for CMD_GETTIMEFULL, Liran Alon, 2020/03/10
- [PATCH v2 12/16] hw/i386/vmport: Add support for CMD_GET_VCPU_INFO, Liran Alon, 2020/03/10
- [PATCH v2 13/16] hw/i386/vmport: Allow x2apic without IR, Liran Alon, 2020/03/10
- [PATCH v2 14/16] i386/cpu: Store LAPIC bus frequency in CPU structure, Liran Alon, 2020/03/10
- [PATCH v2 15/16] hw/i386/vmport: Add support for CMD_GETHZ, Liran Alon, 2020/03/10
- [PATCH v2 16/16] hw/i386/vmport: Assert vmport initialized before registering commands, Liran Alon, 2020/03/10