From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMlM6-00019Y-L4 for qemu-devel@nongnu.org; Fri, 12 Oct 2012 15:57:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TMlM5-0000wz-CR for qemu-devel@nongnu.org; Fri, 12 Oct 2012 15:57:10 -0400 Received: from hub021-nj-6.exch021.serverdata.net ([206.225.164.222]:25290) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMlM5-0000wu-8D for qemu-devel@nongnu.org; Fri, 12 Oct 2012 15:57:09 -0400 From: Don Slutz Date: Fri, 12 Oct 2012 15:56:11 -0400 Message-ID: <1350071782-23078-7-git-send-email-Don@CloudSwitch.com> In-Reply-To: <1350071782-23078-1-git-send-email-Don@CloudSwitch.com> References: <1350071782-23078-1-git-send-email-Don@CloudSwitch.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v7 06/17] target-i386: Add cpu object access routines for Hypervisor features. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, kvm@vger.kernel.org, mtosatti@redhat.com, ehabkost@redhat.com, imammedo@redhat.com, avi@redhat.com, afaerber@suse.de, peter.maydell@linaro.org, anthony@codemonkey.ws Cc: Don Slutz Part of "target-i386: Add way to expose VMWare CPUID" Also known as kvm festures or Hypervisor vendor-neutral interface identification. This is just the EAX value for 0x40000001. QEMU knows this is KVM_CPUID_FEATURES (0x40000001) in some builds. When exposing VMWare CPUID this needs to be set to zero. This 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 Signed-off-by: Don Slutz --- target-i386/cpu.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index a87527c..b335a1e 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1229,6 +1229,29 @@ static void x86_cpuid_set_hv_vendor(Object *obj, const char *value, env->cpuid_hv_vendor_set = true; } +static void x86_cpuid_get_hv_features(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + + visit_type_uint32(v, &cpu->env.cpuid_hv_features, name, errp); +} + +static void x86_cpuid_set_hv_features(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + uint32_t value; + + visit_type_uint32(v, &value, name, errp); + if (error_is_set(errp)) { + return; + } + + cpu->env.cpuid_hv_features = value; + cpu->env.cpuid_hv_features_set = true; +} + #if !defined(CONFIG_USER_ONLY) static void x86_get_hv_spinlocks(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) @@ -2126,6 +2149,9 @@ static void x86_cpu_initfn(Object *obj) object_property_add_str(obj, "hypervisor-vendor", x86_cpuid_get_hv_vendor, x86_cpuid_set_hv_vendor, NULL); + object_property_add(obj, "hypervisor-features", "int", + x86_cpuid_get_hv_features, + x86_cpuid_set_hv_features, NULL, NULL, NULL); #if !defined(CONFIG_USER_ONLY) object_property_add(obj, "hv_spinlocks", "int", x86_get_hv_spinlocks, -- 1.7.1