From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEmyg-0000jA-4I for qemu-devel@nongnu.org; Thu, 20 Sep 2012 16:04:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TEmye-0001W1-SK for qemu-devel@nongnu.org; Thu, 20 Sep 2012 16:04:01 -0400 Received: from hub021-nj-8.exch021.serverdata.net ([206.225.164.233]:44090) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEmye-0001Vx-Od for qemu-devel@nongnu.org; Thu, 20 Sep 2012 16:04:00 -0400 From: Don Slutz Date: Thu, 20 Sep 2012 16:03:21 -0400 Message-ID: <1348171412-23669-7-git-send-email-Don@CloudSwitch.com> In-Reply-To: <1348171412-23669-1-git-send-email-Don@CloudSwitch.com> References: <1348171412-23669-1-git-send-email-Don@CloudSwitch.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v4 06/17] target-i386: Use Hypervisor level in -machine pc, accel=kvm. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Also known as Paravirtualization level. This change is based on: Microsoft Hypervisor CPUID Leaves: http://msdn.microsoft.com/en-us/library/windows/hardware/ff542428%28v=vs.85%29.aspx Linux kernel change starts with: http://fixunix.com/kernel/538707-use-cpuid-communicate-hypervisor.html Also: http://lkml.indiana.edu/hypermail/linux/kernel/1205.0/00100.html VMware documention on CPUIDs (Mechanisms to determine if software is running in a VMware virtual machine): http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1009458 QEMU knows this is KVM_CPUID_SIGNATURE (0x40000000). Signed-off-by: Don Slutz --- target-i386/kvm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 895d848..bf27793 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -389,12 +389,12 @@ 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()) { + if (env->cpuid_hv_level == 0) { memcpy(signature, "KVMKVMKVM\0\0\0", 12); c->eax = 0; } else { memcpy(signature, "Microsoft Hv", 12); - c->eax = HYPERV_CPUID_MIN; + c->eax = env->cpuid_hv_level; } c->ebx = signature[0]; c->ecx = signature[1]; -- 1.7.1