From patchwork Mon Sep 17 13:39:41 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [v3, 10/17] target-i386: Use Hypervisor vendor in -machine pc,
 accel=kvm.
Date: Mon, 17 Sep 2012 03:39:41 -0000
From: Don Slutz <Don@CloudSwitch.com>
X-Patchwork-Id: 184440
Message-Id: <1347889189-9199-18-git-send-email-Don@CloudSwitch.com>
To: <qemu-devel@nongnu.org>, <mtosatti@redhat.com>, <ehabkost@redhat.com>,
 <imammedo@redhat.com>, <avi@redhat.com>, <afaerber@suse.de>,
 <peter.maydell@linaro.org>, <kvm@vger.kernel.org>, <anthony@codemonkey.ws>
Cc: Don Slutz <Don@CloudSwitch.com>

Signed-off-by: Don Slutz <Don@CloudSwitch.com>

---
target-i386/kvm.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index bf27793..b8789f2 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -392,13 +392,15 @@ int kvm_arch_init_vcpu(CPUX86State *env)
     if (env->cpuid_hv_level == 0) {
         memcpy(signature, "KVMKVMKVM\0\0\0", 12);
         c->eax = 0;
+        c->ebx = signature[0];
+        c->ecx = signature[1];
+        c->edx = signature[2];
     } else {
-        memcpy(signature, "Microsoft Hv", 12);
         c->eax = env->cpuid_hv_level;
+        c->ebx = env->cpuid_hv_vendor1;
+        c->ecx = env->cpuid_hv_vendor2;
+        c->edx = env->cpuid_hv_vendor3;
     }
-    c->ebx = signature[0];
-    c->ecx = signature[1];
-    c->edx = signature[2];
 
     c = &cpuid_data.entries[cpuid_i++];
     memset(c, 0, sizeof(*c));