[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 14/16] target-i386: Add setting of Hypervisor lea
From: |
Don Slutz |
Subject: |
[Qemu-devel] [PATCH v6 14/16] target-i386: Add setting of Hypervisor leaf extra for known vmare4. |
Date: |
Mon, 24 Sep 2012 10:32:16 -0400 |
This was taken from:
http://article.gmane.org/gmane.comp.emulators.kvm.devel/22643
Signed-off-by: Don Slutz <address@hidden>
---
target-i386/cpu.c | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 8bb20c7..b77dbfe 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1135,6 +1135,36 @@ static void x86_cpuid_set_model_id(Object *obj, const
char *model_id,
}
}
+static void x86_cpuid_set_vmware_extra(Object *obj)
+{
+ X86CPU *cpu = X86_CPU(obj);
+
+ if ((cpu->env.tsc_khz != 0) &&
+ (cpu->env.cpuid_hv_level == CPUID_HV_LEVEL_VMWARE_4) &&
+ (cpu->env.cpuid_hv_vendor1 == CPUID_HV_VENDOR_VMWARE_1) &&
+ (cpu->env.cpuid_hv_vendor2 == CPUID_HV_VENDOR_VMWARE_2) &&
+ (cpu->env.cpuid_hv_vendor3 == CPUID_HV_VENDOR_VMWARE_3)) {
+ const uint32_t apic_khz = 1000000L;
+
+ /*
+ * From article.gmane.org/gmane.comp.emulators.kvm.devel/22643
+ *
+ * Leaf 0x40000010, Timing Information.
+ *
+ * VMware has defined the first generic leaf to provide timing
+ * information. This leaf returns the current TSC frequency and
+ * current Bus frequency in kHz.
+ *
+ * # EAX: (Virtual) TSC frequency in kHz.
+ * # EBX: (Virtual) Bus (local apic timer) frequency in kHz.
+ * # ECX, EDX: RESERVED (Per above, reserved fields are set to
zero).
+ */
+ cpu->env.cpuid_hv_extra = 0x40000010;
+ cpu->env.cpuid_hv_extra_a = (uint32_t)cpu->env.tsc_khz;
+ cpu->env.cpuid_hv_extra_b = apic_khz;
+ }
+}
+
static void x86_cpuid_get_tsc_freq(Object *obj, Visitor *v, void *opaque,
const char *name, Error **errp)
{
@@ -1164,6 +1194,7 @@ static void x86_cpuid_set_tsc_freq(Object *obj, Visitor
*v, void *opaque,
}
cpu->env.tsc_khz = value / 1000;
+ x86_cpuid_set_vmware_extra(obj);
}
static void x86_cpuid_get_hv_level(Object *obj, Visitor *v, void *opaque,
@@ -1277,6 +1308,7 @@ static void x86_cpuid_set_hv_vendor(Object *obj, const
char *value,
env->cpuid_hv_vendor3 |= ((uint8_t)adj_value[i + 8]) << (8 * i);
}
env->cpuid_hv_vendor_set = true;
+ x86_cpuid_set_vmware_extra(obj);
}
static void x86_cpuid_get_hv_extra(Object *obj, Visitor *v, void *opaque,
--
1.7.1
- [Qemu-devel] [PATCH v6 04/16] target-i386: Add x86_set_hyperv., (continued)
- [Qemu-devel] [PATCH v6 04/16] target-i386: Add x86_set_hyperv., Don Slutz, 2012/09/24
- [Qemu-devel] [PATCH v6 07/16] target-i386: Add Hypervisor vendor., Don Slutz, 2012/09/24
- [Qemu-devel] [PATCH v6 08/16] target-i386: Add cpu object access routines for Hypervisor vendor., Don Slutz, 2012/09/24
- [Qemu-devel] [PATCH v6 09/16] target-i386: Use Hypervisor vendor in -machine pc, accel=kvm., Don Slutz, 2012/09/24
- [Qemu-devel] [PATCH v6 11/16] target-i386: Add some known names to Hypervisor vendor., Don Slutz, 2012/09/24
- [Qemu-devel] [PATCH v6 12/16] target-i386: Add optional Hypervisor leaf extra., Don Slutz, 2012/09/24
- [Qemu-devel] [PATCH v6 10/16] target-i386: Use Hypervisor vendor in -machine pc, accel=tcg., Don Slutz, 2012/09/24
- [Qemu-devel] [PATCH v6 16/16] target-i386: Use Hypervisor leaf extra in -machine pc, accel=tcg., Don Slutz, 2012/09/24
- [Qemu-devel] [PATCH v6 13/16] target-i386: Add cpu object access routines for Hypervisor leaf extra., Don Slutz, 2012/09/24
- [Qemu-devel] [PATCH v6 15/16] target-i386: Use Hypervisor leaf extra in -machine pc, accel=kvm., Don Slutz, 2012/09/24
- [Qemu-devel] [PATCH v6 14/16] target-i386: Add setting of Hypervisor leaf extra for known vmare4.,
Don Slutz <=