[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 09/16] hw/i386/vmport: Add support for CMD_GETBIOSUUID
From: |
Liran Alon |
Subject: |
[PATCH v3 09/16] hw/i386/vmport: Add support for CMD_GETBIOSUUID |
Date: |
Thu, 12 Mar 2020 18:54:24 +0200 |
This is VMware documented functionallity that some guests rely on.
Returns the BIOS UUID of the current virtual machine.
Note that we also introduce a new compatability flag "x-cmds-v2" to
make sure to expose new VMPort commands only to new machine-types.
This flag will also be used by the following patches that will introduce
additional VMPort commands.
Reviewed-by: Nikita Leshenko <address@hidden>
Signed-off-by: Liran Alon <address@hidden>
---
hw/core/machine.c | 1 +
hw/i386/vmport.c | 22 ++++++++++++++++++++++
include/hw/i386/vmport.h | 1 +
3 files changed, 24 insertions(+)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 0e2f37420360..523fa56991dc 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -42,6 +42,7 @@ GlobalProperty hw_compat_4_2[] = {
{ "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);
diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c
index 6ab094311d6c..3fb8a8bd458a 100644
--- a/hw/i386/vmport.c
+++ b/hw/i386/vmport.c
@@ -34,6 +34,7 @@
#include "hw/i386/vmport.h"
#include "hw/input/i8042.h"
#include "hw/qdev-properties.h"
+#include "sysemu/sysemu.h"
#include "sysemu/hw_accel.h"
#include "qemu/log.h"
#include "trace.h"
@@ -44,12 +45,15 @@
#define VMPORT_COMPAT_READ_SET_EAX_BIT 0
#define VMPORT_COMPAT_SIGNAL_UNSUPPORTED_CMD_BIT 1
#define VMPORT_COMPAT_REPORT_VMX_TYPE_BIT 2
+#define VMPORT_COMPAT_CMDS_V2_BIT 3
#define VMPORT_COMPAT_READ_SET_EAX \
(1 << VMPORT_COMPAT_READ_SET_EAX_BIT)
#define VMPORT_COMPAT_SIGNAL_UNSUPPORTED_CMD \
(1 << VMPORT_COMPAT_SIGNAL_UNSUPPORTED_CMD_BIT)
#define VMPORT_COMPAT_REPORT_VMX_TYPE \
(1 << VMPORT_COMPAT_REPORT_VMX_TYPE_BIT)
+#define VMPORT_COMPAT_CMDS_V2 \
+ (1 << VMPORT_COMPAT_CMDS_V2_BIT)
#define VMPORT(obj) OBJECT_CHECK(VMPortState, (obj), TYPE_VMPORT)
@@ -144,6 +148,18 @@ static uint32_t vmport_cmd_get_version(void *opaque,
uint32_t addr)
return port_state->vmware_vmx_version;
}
+static uint32_t vmport_cmd_get_bios_uuid(void *opaque, uint32_t addr)
+{
+ X86CPU *cpu = X86_CPU(current_cpu);
+ uint32_t *uuid_parts = (uint32_t *)(qemu_uuid.data);
+
+ cpu->env.regs[R_EAX] = le32_to_cpu(uuid_parts[0]);
+ cpu->env.regs[R_EBX] = le32_to_cpu(uuid_parts[1]);
+ cpu->env.regs[R_ECX] = le32_to_cpu(uuid_parts[2]);
+ cpu->env.regs[R_EDX] = le32_to_cpu(uuid_parts[3]);
+ return cpu->env.regs[R_EAX];
+}
+
static uint32_t vmport_cmd_ram_size(void *opaque, uint32_t addr)
{
X86CPU *cpu = X86_CPU(current_cpu);
@@ -192,9 +208,13 @@ static void vmport_realizefn(DeviceState *dev, Error
**errp)
isa_register_ioport(isadev, &s->io, 0x5658);
port_state = s;
+
/* Register some generic port commands */
vmport_register(VMPORT_CMD_GETVERSION, vmport_cmd_get_version, NULL);
vmport_register(VMPORT_CMD_GETRAMSIZE, vmport_cmd_ram_size, NULL);
+ if (s->compat_flags & VMPORT_COMPAT_CMDS_V2) {
+ vmport_register(VMPORT_CMD_GETBIOSUUID, vmport_cmd_get_bios_uuid,
NULL);
+ }
}
static Property vmport_properties[] = {
@@ -205,6 +225,8 @@ static Property vmport_properties[] = {
VMPORT_COMPAT_SIGNAL_UNSUPPORTED_CMD_BIT, true),
DEFINE_PROP_BIT("x-report-vmx-type", VMPortState, compat_flags,
VMPORT_COMPAT_REPORT_VMX_TYPE_BIT, true),
+ DEFINE_PROP_BIT("x-cmds-v2", VMPortState, compat_flags,
+ VMPORT_COMPAT_CMDS_V2_BIT, true),
/* Default value taken from open-vm-tools code VERSION_MAGIC definition */
DEFINE_PROP_UINT32("vmware-vmx-version", VMPortState,
diff --git a/include/hw/i386/vmport.h b/include/hw/i386/vmport.h
index 0501ccac6ddf..7f33512ca6f0 100644
--- a/include/hw/i386/vmport.h
+++ b/include/hw/i386/vmport.h
@@ -6,6 +6,7 @@ typedef uint32_t (VMPortReadFunc)(void *opaque, uint32_t
address);
typedef enum {
VMPORT_CMD_GETVERSION = 10,
+ VMPORT_CMD_GETBIOSUUID = 19,
VMPORT_CMD_GETRAMSIZE = 20,
VMPORT_CMD_VMMOUSE_DATA = 39,
VMPORT_CMD_VMMOUSE_STATUS = 40,
--
2.20.1
- Re: [PATCH v3 08/16] hw/i386/vmport: Define enum for all commands, (continued)
- [PATCH v3 10/16] hw/i386/vmport: Add support for CMD_GETTIME, Liran Alon, 2020/03/12
- Re: [PATCH v3 10/16] hw/i386/vmport: Add support for CMD_GETTIME, Michael S. Tsirkin, 2020/03/12
- Re: [PATCH v3 10/16] hw/i386/vmport: Add support for CMD_GETTIME, Liran Alon, 2020/03/13
- Re: [PATCH v3 10/16] hw/i386/vmport: Add support for CMD_GETTIME, Michael S. Tsirkin, 2020/03/13
- Re: [PATCH v3 10/16] hw/i386/vmport: Add support for CMD_GETTIME, Liran Alon, 2020/03/13
- Re: [PATCH v3 10/16] hw/i386/vmport: Add support for CMD_GETTIME, Michael S. Tsirkin, 2020/03/14
- Re: [PATCH v3 10/16] hw/i386/vmport: Add support for CMD_GETTIME, Liran Alon, 2020/03/14
- Re: [PATCH v3 10/16] hw/i386/vmport: Add support for CMD_GETTIME, Michael S. Tsirkin, 2020/03/14
- Re: [PATCH v3 10/16] hw/i386/vmport: Add support for CMD_GETTIME, Liran Alon, 2020/03/14
[PATCH v3 09/16] hw/i386/vmport: Add support for CMD_GETBIOSUUID,
Liran Alon <=
[PATCH v3 11/16] hw/i386/vmport: Add support for CMD_GETTIMEFULL, Liran Alon, 2020/03/12
[PATCH v3 12/16] hw/i386/vmport: Add support for CMD_GET_VCPU_INFO, Liran Alon, 2020/03/12
[PATCH v3 13/16] hw/i386/vmport: Allow x2apic without IR, Liran Alon, 2020/03/12
[PATCH v3 14/16] i386/cpu: Store LAPIC bus frequency in CPU structure, Liran Alon, 2020/03/12
[PATCH v3 16/16] hw/i386/vmport: Assert vmport initialized before registering commands, Liran Alon, 2020/03/12
[PATCH v3 15/16] hw/i386/vmport: Add support for CMD_GETHZ, Liran Alon, 2020/03/12