From patchwork Sat Sep 22 00:13:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Slutz X-Patchwork-Id: 185999 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5B4AF2C0081 for ; Sat, 22 Sep 2012 10:35:15 +1000 (EST) Received: from localhost ([::1]:60934 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFDNj-0002Ys-NY for incoming@patchwork.ozlabs.org; Fri, 21 Sep 2012 20:15:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47795) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFDMh-0000Lb-7I for qemu-devel@nongnu.org; Fri, 21 Sep 2012 20:14:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TFDMg-0007x2-0C for qemu-devel@nongnu.org; Fri, 21 Sep 2012 20:14:35 -0400 Received: from hub021-nj-7.exch021.serverdata.net ([206.225.164.223]:38264) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFDMf-0007wx-Rx for qemu-devel@nongnu.org; Fri, 21 Sep 2012 20:14:33 -0400 Received: from localhost.localdomain (131.239.15.22) by east.exch021.serverdata.net (10.240.4.115) with Microsoft SMTP Server (TLS) id 14.2.309.2; Fri, 21 Sep 2012 17:14:33 -0700 From: Don Slutz To: , , , , , , , , Date: Fri, 21 Sep 2012 20:13:19 -0400 Message-ID: <1348272809-27742-8-git-send-email-Don@CloudSwitch.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1348272809-27742-1-git-send-email-Don@CloudSwitch.com> References: <1348272809-27742-1-git-send-email-Don@CloudSwitch.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows XP/2000 (RFC1323+, w+, tstamp-) X-Received-From: 206.225.164.223 Cc: Don Slutz Subject: [Qemu-devel] [PATCH v5 07/17] target-i386: Use Hypervisor level in -machine pc, accel=tcg. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 e5deca2..bf6faed 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1650,6 +1650,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; @@ -1788,6 +1803,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;