[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 10/16] hw/i386/vmport: Add support for CMD_GETTIME
From: |
Liran Alon |
Subject: |
[PATCH v2 10/16] hw/i386/vmport: Add support for CMD_GETTIME |
Date: |
Tue, 10 Mar 2020 18:53:26 +0200 |
This command is used by guest to gettimeofday() from host.
See usage example in open-vm-tools TimeSyncReadHost() function.
Reviewed-by: Nikita Leshenko <address@hidden>
Signed-off-by: Liran Alon <address@hidden>
---
hw/i386/vmport.c | 21 +++++++++++++++++++++
include/hw/i386/vmport.h | 1 +
2 files changed, 22 insertions(+)
diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c
index ef94f4fe78c6..15632c579199 100644
--- a/hw/i386/vmport.c
+++ b/hw/i386/vmport.c
@@ -55,6 +55,7 @@ typedef struct VMPortState {
uint32_t vmx_version;
uint8_t vmx_type;
+ uint32_t max_time_lag_us;
uint8_t version;
} VMPortState;
@@ -157,6 +158,20 @@ static uint32_t vmport_cmd_ram_size(void *opaque, uint32_t
addr)
return ram_size;
}
+static uint32_t vmport_cmd_time(void *opaque, uint32_t addr)
+{
+ X86CPU *cpu = X86_CPU(current_cpu);
+ qemu_timeval tv;
+
+ if (qemu_gettimeofday(&tv) < 0) {
+ return UINT32_MAX;
+ }
+
+ cpu->env.regs[R_EBX] = (uint32_t)tv.tv_usec;
+ cpu->env.regs[R_ECX] = port_state->max_time_lag_us;
+ return (uint32_t)tv.tv_sec;
+}
+
/* vmmouse helpers */
void vmmouse_get_data(uint32_t *data)
{
@@ -203,6 +218,7 @@ static void vmport_realizefn(DeviceState *dev, Error **errp)
vmport_register(VMPORT_CMD_GETRAMSIZE, vmport_cmd_ram_size, NULL);
if (s->version > 1) {
vmport_register(VMPORT_CMD_GETBIOSUUID, vmport_cmd_get_bios_uuid,
NULL);
+ vmport_register(VMPORT_CMD_GETTIME, vmport_cmd_time, NULL);
}
}
@@ -218,6 +234,11 @@ static Property vmport_properties[] = {
DEFINE_PROP_UINT32("vmx-version", VMPortState, vmx_version, 6),
DEFINE_PROP_UINT8("vmx-type", VMPortState, vmx_type,
VMX_TYPE_SCALABLE_SERVER),
+ /*
+ * Max amount of time lag that can go uncorrected.
+ * Value taken from VMware Workstation 5.5.
+ **/
+ DEFINE_PROP_UINT32("max-time-lag", VMPortState, max_time_lag_us, 1000000),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/include/hw/i386/vmport.h b/include/hw/i386/vmport.h
index 7f33512ca6f0..50416c8c8f3e 100644
--- a/include/hw/i386/vmport.h
+++ b/include/hw/i386/vmport.h
@@ -8,6 +8,7 @@ typedef enum {
VMPORT_CMD_GETVERSION = 10,
VMPORT_CMD_GETBIOSUUID = 19,
VMPORT_CMD_GETRAMSIZE = 20,
+ VMPORT_CMD_GETTIME = 23,
VMPORT_CMD_VMMOUSE_DATA = 39,
VMPORT_CMD_VMMOUSE_STATUS = 40,
VMPORT_CMD_VMMOUSE_COMMAND = 41,
--
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, 2020/03/10
- [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 <=
- [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
- [PATCH v2 08/16] hw/i386/vmport: Define enum for all commands, Liran Alon, 2020/03/10
- Re: [PATCH v2 00/16]: hw/i386/vmport: Bug fixes and improvements, Michael S. Tsirkin, 2020/03/10