From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBR8M-0004dO-IR for qemu-devel@nongnu.org; Tue, 11 Sep 2012 10:08:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TBR8G-0004kx-Tw for qemu-devel@nongnu.org; Tue, 11 Sep 2012 10:08:10 -0400 Received: from hub021-nj-6.exch021.serverdata.net ([206.225.164.222]:26055) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBR8G-0004kl-Qq for qemu-devel@nongnu.org; Tue, 11 Sep 2012 10:08:04 -0400 From: Don Slutz Date: Tue, 11 Sep 2012 10:07:47 -0400 Message-ID: <1347372467-3316-5-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 v2 4/4] target-i386: Add Hypervisor CPUIDs in accel=tcg mode. 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.comqemu-devel@nongnu.orgmtosatti@redhat.comehabkost@redhat.comimammedo@redhat.com Cc: peter.maydell@linaro.org, kvm@vger.kernel.org, Don Slutz , avi@redhat.com, anthony@codemonkey.ws, afaerber@suse.de Signed-off-by: Don Slutz --- target-i386/cpu.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 9f1f390..89a45b5 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1815,6 +1815,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; @@ -1953,6 +1963,29 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, *edx = 0; } break; + case 0x40000000: + *eax = env->cpuid_hv_level; + *ebx = env->cpuid_hv_vendor1; + *ecx = env->cpuid_hv_vendor2; + *edx = env->cpuid_hv_vendor3; + break; + case 0x40000001: + *eax = env->cpuid_kvm_features; + *ebx = 0; + *ecx = 0; + *edx = 0; + break; + case 0x40000002 ... 0x400000FF: + if (index == env->cpuid_hv_extra) { + *eax = env->cpuid_hv_extra_a; + *ebx = env->cpuid_hv_extra_b; + } else { + *eax = 0; + *ebx = 0; + } + *ecx = 0; + *edx = 0; + break; case 0x80000000: *eax = env->cpuid_xlevel; *ebx = env->cpuid_vendor1; -- 1.7.1