[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 11/17] target-i386: Use Hypervisor vendor in -mac
From: |
Don Slutz |
Subject: |
[Qemu-devel] [PATCH v7 11/17] target-i386: Use Hypervisor vendor in -machine pc, accel=kvm. |
Date: |
Fri, 12 Oct 2012 15:56:16 -0400 |
Part of "target-i386: Add way to expose VMWare CPUID"
Also known as Paravirtualization vendor.
This is EBX, ECX, and EDX data for 0x40000000.
QEMU knows this is KVM_CPUID_SIGNATURE (0x40000000).
If hypervisor vendor is set then add kvm's
signature at KVM_CPUID_SIGNATURE_NEXT (0x40000100).
Signed-off-by: Don Slutz <address@hidden>
---
target-i386/kvm.c | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 30963e1..513356d 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -390,20 +390,21 @@ int kvm_arch_init_vcpu(CPUX86State *env)
c = &cpuid_data.entries[cpuid_i++];
memset(c, 0, sizeof(*c));
c->function = KVM_CPUID_SIGNATURE;
- if (!hyperv_enabled()) {
- memcpy(signature, "KVMKVMKVM\0\0\0", 12);
- if (!env->cpuid_hv_level_set) {
- c->eax = 0;
- } else {
- c->eax = env->cpuid_hv_level;
- }
+ if (!env->cpuid_hv_level_set) {
+ c->eax = 0;
} else {
- memcpy(signature, "Microsoft Hv", 12);
c->eax = env->cpuid_hv_level;
}
- c->ebx = signature[0];
- c->ecx = signature[1];
- c->edx = signature[2];
+ if (!env->cpuid_hv_vendor_set) {
+ memcpy(signature, "KVMKVMKVM\0\0\0", 12);
+ c->ebx = signature[0];
+ c->ecx = signature[1];
+ c->edx = signature[2];
+ } else {
+ c->ebx = env->cpuid_hv_vendor1;
+ c->ecx = env->cpuid_hv_vendor2;
+ c->edx = env->cpuid_hv_vendor3;
+ }
c = &cpuid_data.entries[cpuid_i++];
memset(c, 0, sizeof(*c));
@@ -448,7 +449,8 @@ int kvm_arch_init_vcpu(CPUX86State *env)
c->function = HYPERV_CPUID_IMPLEMENT_LIMITS;
c->eax = 0x40;
c->ebx = 0x40;
-
+ }
+ if (env->cpuid_hv_vendor_set) {
c = &cpuid_data.entries[cpuid_i++];
memset(c, 0, sizeof(*c));
c->function = KVM_CPUID_SIGNATURE_NEXT;
--
1.7.1
- [Qemu-devel] [PATCH v7 01/17] target-i386: Add Hypervisor level., (continued)
- [Qemu-devel] [PATCH v7 01/17] target-i386: Add Hypervisor level., Don Slutz, 2012/10/12
- [Qemu-devel] [PATCH v7 03/17] target-i386: Add Hypervisor features., Don Slutz, 2012/10/12
- [Qemu-devel] [PATCH v7 02/17] target-i386: Add Hypervisor vendor., Don Slutz, 2012/10/12
- [Qemu-devel] [PATCH v7 04/17] target-i386: Add cpu object access routines for Hypervisor level., Don Slutz, 2012/10/12
- [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 <=
- [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, 2012/10/12
- [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