[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 13/17] target-i386: Add VMWare CPUID Timing infor
From: |
Don Slutz |
Subject: |
[Qemu-devel] [PATCH v7 13/17] target-i386: Add VMWare CPUID Timing information in -machine pc, accel=kvm. |
Date: |
Fri, 12 Oct 2012 15:56:18 -0400 |
Part of "target-i386: Add way to expose VMWare CPUID"
This is EAX and EBX data for 0x40000010.
Add new #define CPUID_HV_TIMING_INFO for this.
The best documentation I have found is:
http://article.gmane.org/gmane.comp.emulators.kvm.devel/22643
And a test under ESXi 4.0 shows that VMware is setting this data.
Signed-off-by: Don Slutz <address@hidden>
---
target-i386/cpu.h | 4 ++++
target-i386/kvm.c | 22 ++++++++++++++++++++++
2 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 9a34c7b..6ceef05 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -488,6 +488,10 @@
#define CPUID_VENDOR_VIA "CentaurHauls"
+/* VMware hardware version 7 defines timing information as
+ * 0x40000010. */
+#define CPUID_HV_TIMING_INFO 0x40000010
+
/* The maximum input value for hypervisor CPUID information for
* Microsoft hypervisors. Is related to HYPERV_CPUID_MIN. */
#define CPUID_HV_LEVEL_HYPERV_CPUID_MIN 0x40000005
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index b61027f..81b0014 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -451,6 +451,28 @@ int kvm_arch_init_vcpu(CPUX86State *env)
c->eax = 0x40;
c->ebx = 0x40;
}
+ if (env->cpuid_hv_level >= CPUID_HV_TIMING_INFO) {
+ 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).
+ */
+ c = &cpuid_data.entries[cpuid_i++];
+ memset(c, 0, sizeof(*c));
+ c->function = CPUID_HV_TIMING_INFO;
+ c->eax = (uint32_t)env->tsc_khz;
+ c->ebx = apic_khz;
+ }
if (env->cpuid_hv_vendor_set) {
c = &cpuid_data.entries[cpuid_i++];
memset(c, 0, sizeof(*c));
--
1.7.1
- [Qemu-devel] [PATCH v7 05/17] target-i386: Add cpu object access routines for Hypervisor vendor., (continued)
- [Qemu-devel] [PATCH v7 05/17] target-i386: Add cpu object access routines for Hypervisor vendor., Don Slutz, 2012/10/12
- [Qemu-devel] [PATCH v7 06/17] target-i386: Add cpu object access routines for Hypervisor features., Don Slutz, 2012/10/12
- [Qemu-devel] [PATCH v7 07/17] target-i386: Add x86_set_hyperv., Don Slutz, 2012/10/12
- [Qemu-devel] [PATCH v7 08/17] target-i386: Use x86_set_hyperv to set hypervisor vendor., Don Slutz, 2012/10/12
- [Qemu-devel] [PATCH v7 09/17] target-i386: Use x86_set_hyperv to set hypervisor features., Don Slutz, 2012/10/12
- [Qemu-devel] [PATCH v7 10/17] target-i386: Use Hypervisor level in -machine pc, accel=kvm., Don Slutz, 2012/10/12
- [Qemu-devel] [PATCH v7 11/17] target-i386: Use Hypervisor vendor in -machine pc, accel=kvm., Don Slutz, 2012/10/12
- [Qemu-devel] [PATCH v7 15/17] target-i386: Use Hypervisor level in -machine pc, accel=tcg., Don Slutz, 2012/10/12
- [Qemu-devel] [PATCH v7 17/17] target-i386: target-i386: Add VMWare CPUID Timing information in -machine pc, accel=tcg, Don Slutz, 2012/10/12
- [Qemu-devel] [PATCH v7 12/17] target-i386: Use Hypervisor features in -machine pc, accel=kvm., Don Slutz, 2012/10/12
- [Qemu-devel] [PATCH v7 13/17] target-i386: Add VMWare CPUID Timing information in -machine pc, accel=kvm.,
Don Slutz <=
- [Qemu-devel] [PATCH v7 16/17] target-i386: Use Hypervisor vendor in -machine pc, accel=tcg., Don Slutz, 2012/10/12
- [Qemu-devel] [PATCH v7 14/17] target-i386: Add vmare as a known name to Hypervisor vendor., Don Slutz, 2012/10/12
- Re: [Qemu-devel] [PATCH v7 00/17] target-i386: Add way to expose VMWare CPUID, Marcelo Tosatti, 2012/10/29