qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Don Slutz <Don@CloudSwitch.com>
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 <Don@CloudSwitch.com>
Subject: [Qemu-devel] [PATCH v6 10/16] target-i386: Use Hypervisor vendor in -machine pc, accel=tcg.
Date: Mon, 24 Sep 2012 10:32:12 -0400	[thread overview]
Message-ID: <1348497138-2516-11-git-send-email-Don@CloudSwitch.com> (raw)
In-Reply-To: <1348497138-2516-1-git-send-email-Don@CloudSwitch.com>

Also known as Paravirtualization vendor.

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
This is where the 0 is the same as 0x40000001 is defined.

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 <Don@CloudSwitch.com>
---
 target-i386/cpu.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 964877f..a929b64 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1695,7 +1695,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
             }
         }
     } else if (index & 0x40000000) {
-        if (env->cpuid_hv_level_set) {
+        if (env->cpuid_hv_level_set || env->cpuid_hv_vendor_set) {
             uint32_t real_level = env->cpuid_hv_level;
 
             /* Handle Hypervisor CPUIDs */
@@ -1849,9 +1849,9 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
         break;
     case 0x40000000:
         *eax = env->cpuid_hv_level;
-        *ebx = 0;
-        *ecx = 0;
-        *edx = 0;
+        *ebx = env->cpuid_hv_vendor1;
+        *ecx = env->cpuid_hv_vendor2;
+        *edx = env->cpuid_hv_vendor3;
         break;
     case 0x40000001:
         *eax = env->cpuid_kvm_features;
-- 
1.7.1

  parent reply	other threads:[~2012-09-24 14:33 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-24 14:32 [Qemu-devel] [PATCH v6 00/16] Allow changing of Hypervisor CPUIDs Don Slutz
2012-09-24 14:32 ` [Qemu-devel] [PATCH v6 01/16] target-i386: Add missing kvm bits Don Slutz
2012-09-24 14:32 ` [Qemu-devel] [PATCH v6 02/16] target-i386: Add Hypervisor level Don Slutz
2012-09-24 14:32 ` [Qemu-devel] [PATCH v6 03/16] target-i386: Add cpu object access routines for " Don Slutz
     [not found]   ` <20121009162520.GB12330@amt.cnet>
2012-10-09 19:13     ` Don Slutz
2012-10-10 15:22       ` Don Slutz
2012-10-10 15:40         ` Andreas Färber
2012-10-11 22:20           ` Don Slutz
2012-09-24 14:32 ` [Qemu-devel] [PATCH v6 04/16] target-i386: Add x86_set_hyperv Don Slutz
     [not found]   ` <20121009163409.GC12330@amt.cnet>
2012-10-09 17:17     ` Marcelo Tosatti
2012-10-09 19:12       ` Don Slutz
2012-10-09 19:15         ` Marcelo Tosatti
2012-09-24 14:32 ` [Qemu-devel] [PATCH v6 05/16] target-i386: Use Hypervisor level in -machine pc, accel=kvm Don Slutz
2012-10-09 17:18   ` Marcelo Tosatti
2012-10-09 18:27     ` Marcelo Tosatti
2012-10-09 18:47       ` Marcelo Tosatti
2012-10-09 19:09         ` Don Slutz
2012-10-09 19:11           ` Marcelo Tosatti
2012-10-10 13:03             ` Don Slutz
2012-10-10 14:08               ` Marcelo Tosatti
2012-09-24 14:32 ` [Qemu-devel] [PATCH v6 06/16] target-i386: Use Hypervisor level in -machine pc, accel=tcg Don Slutz
2012-10-09 19:01   ` Marcelo Tosatti
2012-10-10 13:07     ` Don Slutz
2012-09-24 14:32 ` [Qemu-devel] [PATCH v6 07/16] target-i386: Add Hypervisor vendor Don Slutz
2012-09-24 14:32 ` [Qemu-devel] [PATCH v6 08/16] target-i386: Add cpu object access routines for " Don Slutz
2012-10-09 19:02   ` Marcelo Tosatti
2012-09-24 14:32 ` [Qemu-devel] [PATCH v6 09/16] target-i386: Use Hypervisor vendor in -machine pc, accel=kvm Don Slutz
2012-09-24 14:32 ` Don Slutz [this message]
2012-09-24 14:32 ` [Qemu-devel] [PATCH v6 11/16] target-i386: Add some known names to Hypervisor vendor Don Slutz
2012-09-24 14:32 ` [Qemu-devel] [PATCH v6 12/16] target-i386: Add optional Hypervisor leaf extra Don Slutz
2012-09-24 14:32 ` [Qemu-devel] [PATCH v6 13/16] target-i386: Add cpu object access routines for " Don Slutz
2012-09-24 14:32 ` [Qemu-devel] [PATCH v6 14/16] target-i386: Add setting of Hypervisor leaf extra for known vmare4 Don Slutz
2012-10-09 19:09   ` Marcelo Tosatti
2012-09-24 14:32 ` [Qemu-devel] [PATCH v6 15/16] target-i386: Use Hypervisor leaf extra in -machine pc, accel=kvm Don Slutz
2012-09-24 14:32 ` [Qemu-devel] [PATCH v6 16/16] target-i386: Use Hypervisor leaf extra in -machine pc, accel=tcg Don Slutz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1348497138-2516-11-git-send-email-Don@CloudSwitch.com \
    --to=don@cloudswitch.com \
    --cc=afaerber@suse.de \
    --cc=anthony@codemonkey.ws \
    --cc=avi@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=mtosatti@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).