From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDbZa-0006aN-IF for qemu-devel@nongnu.org; Mon, 17 Sep 2012 09:41:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDbZV-0003Om-CE for qemu-devel@nongnu.org; Mon, 17 Sep 2012 09:41:14 -0400 Received: from hub021-nj-2.exch021.serverdata.net ([206.225.164.217]:4188) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDbZV-0003NT-8r for qemu-devel@nongnu.org; Mon, 17 Sep 2012 09:41:09 -0400 From: Don Slutz Date: Mon, 17 Sep 2012 09:39:36 -0400 Message-ID: <1347889189-9199-13-git-send-email-Don@CloudSwitch.com> In-Reply-To: <1346354435-21685-1-git-send-email-Don@CloudSwitch.com> References: <1346354435-21685-1-git-send-email-Don@CloudSwitch.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v3 07/17] 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 This does not provide vendor support in tcg yet. Signed-off-by: Don Slutz --- target-i386/cpu.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 4120393..d3b9bd8 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1651,6 +1651,16 @@ 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 > 0) { + /* Handle Hypervisor CPUIDs */ + if (index > env->cpuid_hv_level) { + index = env->cpuid_hv_level; + } + } else { + if (index > env->cpuid_level) + index = env->cpuid_level; + } } else { if (index > env->cpuid_level) index = env->cpuid_level; @@ -1789,6 +1799,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