From mboxrd@z Thu Jan 1 00:00:00 1970 From: Don Slutz Subject: [PATCH v6 06/16] target-i386: Use Hypervisor level in -machine pc,accel=tcg. Date: Mon, 24 Sep 2012 10:32:08 -0400 Message-ID: <1348497138-2516-7-git-send-email-Don@CloudSwitch.com> References: <1348497138-2516-1-git-send-email-Don@CloudSwitch.com> Mime-Version: 1.0 Content-Type: text/plain Cc: Don Slutz To: , , , , , , , , Return-path: Received: from hub021-nj-6.exch021.serverdata.net ([206.225.164.222]:12269 "EHLO hub021-nj-6.exch021.serverdata.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754599Ab2IXOcm (ORCPT ); Mon, 24 Sep 2012 10:32:42 -0400 In-Reply-To: <1348497138-2516-1-git-send-email-Don@CloudSwitch.com> Sender: kvm-owner@vger.kernel.org List-ID: 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 as KVM_CPUID_SIGNATURE (0x40000000) in kvm on linux. This does not provide vendor support in tcg yet. Signed-off-by: Don Slutz --- target-i386/cpu.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 48bdaf9..920278b 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1651,6 +1651,21 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, index = env->cpuid_xlevel; } } + } else if (index & 0x40000000) { + if (env->cpuid_hv_level_set) { + uint32_t real_level = env->cpuid_hv_level; + + /* Handle Hypervisor CPUIDs */ + if (real_level < 0x40000000) { + real_level = 0x40000000; + } + if (index > real_level) { + index = real_level; + } + } else { + if (index > env->cpuid_level) + index = env->cpuid_level; + } } else { if (index > env->cpuid_level) index = env->cpuid_level; @@ -1789,6 +1804,18 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, *edx = 0; } break; + case 0x40000000: + *eax = env->cpuid_hv_level; + *ebx = 0; + *ecx = 0; + *edx = 0; + break; + case 0x40000001: + *eax = env->cpuid_kvm_features; + *ebx = 0; + *ecx = 0; + *edx = 0; + break; case 0x80000000: *eax = env->cpuid_xlevel; *ebx = env->cpuid_vendor1; -- 1.7.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58426) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TG9iN-0005Pa-QV for qemu-devel@nongnu.org; Mon, 24 Sep 2012 10:32:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TG9iE-0000jO-6e for qemu-devel@nongnu.org; Mon, 24 Sep 2012 10:32:51 -0400 Received: from hub021-nj-6.exch021.serverdata.net ([206.225.164.222]:44565) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TG9iE-0000j6-2j for qemu-devel@nongnu.org; Mon, 24 Sep 2012 10:32:42 -0400 From: Don Slutz Date: Mon, 24 Sep 2012 10:32:08 -0400 Message-ID: <1348497138-2516-7-git-send-email-Don@CloudSwitch.com> In-Reply-To: <1348497138-2516-1-git-send-email-Don@CloudSwitch.com> References: <1348497138-2516-1-git-send-email-Don@CloudSwitch.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v6 06/16] target-i386: Use Hypervisor level in -machine pc, accel=tcg. 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 as KVM_CPUID_SIGNATURE (0x40000000) in kvm on linux. This does not provide vendor support in tcg yet. Signed-off-by: Don Slutz --- target-i386/cpu.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 48bdaf9..920278b 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1651,6 +1651,21 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, index = env->cpuid_xlevel; } } + } else if (index & 0x40000000) { + if (env->cpuid_hv_level_set) { + uint32_t real_level = env->cpuid_hv_level; + + /* Handle Hypervisor CPUIDs */ + if (real_level < 0x40000000) { + real_level = 0x40000000; + } + if (index > real_level) { + index = real_level; + } + } else { + if (index > env->cpuid_level) + index = env->cpuid_level; + } } else { if (index > env->cpuid_level) index = env->cpuid_level; @@ -1789,6 +1804,18 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, *edx = 0; } break; + case 0x40000000: + *eax = env->cpuid_hv_level; + *ebx = 0; + *ecx = 0; + *edx = 0; + break; + case 0x40000001: + *eax = env->cpuid_kvm_features; + *ebx = 0; + *ecx = 0; + *edx = 0; + break; case 0x80000000: *eax = env->cpuid_xlevel; *ebx = env->cpuid_vendor1; -- 1.7.1