From patchwork Thu Sep 20 20:03:31 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [v4, 16/17] target-i386: Use Hypervisor leaf extra in -machine pc,
 accel=kvm.
From: Don Slutz <Don@CloudSwitch.com>
X-Patchwork-Id: 185480
Message-Id: <1348171412-23669-17-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>
Date: Thu, 20 Sep 2012 16:03:31 -0400

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

---
target-i386/kvm.c |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index dde9214..bd7753f 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -457,6 +457,25 @@ int kvm_arch_init_vcpu(CPUX86State *env)
         c->ebx = signature[0];
         c->ecx = signature[1];
         c->edx = signature[2];
+    } else if (env->cpuid_hv_level > 0) {
+        for (i = KVM_CPUID_FEATURES + 1; i <= env->cpuid_hv_level; i++) {
+            c = &cpuid_data.entries[cpuid_i++];
+            memset(c, 0, sizeof(*c));
+            c->function = i;
+            if (i == env->cpuid_hv_extra) {
+                c->eax = env->cpuid_hv_extra_a;
+                c->ebx = env->cpuid_hv_extra_b;
+            }
+        }
+
+        c = &cpuid_data.entries[cpuid_i++];
+        memset(c, 0, sizeof(*c));
+        c->function = KVM_CPUID_SIGNATURE_NEXT;
+        memcpy(signature, "KVMKVMKVM\0\0\0", 12);
+        c->eax = 0;
+        c->ebx = signature[0];
+        c->ecx = signature[1];
+        c->edx = signature[2];
     }
 
     has_msr_async_pf_en = c->eax & (1 << KVM_FEATURE_ASYNC_PF);