All of lore.kernel.org
 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: [PATCH v6 09/16] target-i386: Use Hypervisor vendor in -machine pc,accel=kvm.
Date: Mon, 24 Sep 2012 10:32:11 -0400	[thread overview]
Message-ID: <1348497138-2516-10-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

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/kvm.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 8462c75..f8a5177 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -389,16 +389,18 @@ int kvm_arch_init_vcpu(CPUX86State *env)
     c = &cpuid_data.entries[cpuid_i++];
     memset(c, 0, sizeof(*c));
     c->function = KVM_CPUID_SIGNATURE;
-    if (!env->cpuid_hv_level_set) {
+    if (!env->cpuid_hv_level_set && !env->cpuid_hv_vendor_set) {
         memcpy(signature, "KVMKVMKVM\0\0\0", 12);
         c->eax = 0;
+        c->ebx = signature[0];
+        c->ecx = signature[1];
+        c->edx = signature[2];
     } else {
-        memcpy(signature, "Microsoft Hv", 12);
         c->eax = env->cpuid_hv_level;
+        c->ebx = env->cpuid_hv_vendor1;
+        c->ecx = env->cpuid_hv_vendor2;
+        c->edx = env->cpuid_hv_vendor3;
     }
-    c->ebx = signature[0];
-    c->ecx = signature[1];
-    c->edx = signature[2];
 
     c = &cpuid_data.entries[cpuid_i++];
     memset(c, 0, sizeof(*c));
-- 
1.7.1


WARNING: multiple messages have this Message-ID (diff)
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 09/16] target-i386: Use Hypervisor vendor in -machine pc, accel=kvm.
Date: Mon, 24 Sep 2012 10:32:11 -0400	[thread overview]
Message-ID: <1348497138-2516-10-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

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/kvm.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 8462c75..f8a5177 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -389,16 +389,18 @@ int kvm_arch_init_vcpu(CPUX86State *env)
     c = &cpuid_data.entries[cpuid_i++];
     memset(c, 0, sizeof(*c));
     c->function = KVM_CPUID_SIGNATURE;
-    if (!env->cpuid_hv_level_set) {
+    if (!env->cpuid_hv_level_set && !env->cpuid_hv_vendor_set) {
         memcpy(signature, "KVMKVMKVM\0\0\0", 12);
         c->eax = 0;
+        c->ebx = signature[0];
+        c->ecx = signature[1];
+        c->edx = signature[2];
     } else {
-        memcpy(signature, "Microsoft Hv", 12);
         c->eax = env->cpuid_hv_level;
+        c->ebx = env->cpuid_hv_vendor1;
+        c->ecx = env->cpuid_hv_vendor2;
+        c->edx = env->cpuid_hv_vendor3;
     }
-    c->ebx = signature[0];
-    c->ecx = signature[1];
-    c->edx = signature[2];
 
     c = &cpuid_data.entries[cpuid_i++];
     memset(c, 0, sizeof(*c));
-- 
1.7.1

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

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-24 14:32 [PATCH v6 00/16] Allow changing of Hypervisor CPUIDs Don Slutz
2012-09-24 14:32 ` [Qemu-devel] " Don Slutz
2012-09-24 14:32 ` [PATCH v6 01/16] target-i386: Add missing kvm bits Don Slutz
2012-09-24 14:32   ` [Qemu-devel] " Don Slutz
2012-09-24 14:32 ` [PATCH v6 02/16] target-i386: Add Hypervisor level Don Slutz
2012-09-24 14:32   ` [Qemu-devel] " Don Slutz
2012-09-24 14:32 ` [PATCH v6 03/16] target-i386: Add cpu object access routines for " Don Slutz
2012-09-24 14:32   ` [Qemu-devel] " Don Slutz
2012-10-09 16:25   ` Marcelo Tosatti
2012-10-09 19:13     ` Don Slutz
2012-10-09 19:13       ` [Qemu-devel] " Don Slutz
2012-10-10 15:22       ` Don Slutz
2012-10-10 15:22         ` [Qemu-devel] " Don Slutz
2012-10-10 15:40         ` Andreas Färber
2012-10-10 15:40           ` [Qemu-devel] " Andreas Färber
2012-10-11 22:20           ` Don Slutz
2012-10-11 22:20             ` [Qemu-devel] " Don Slutz
2012-09-24 14:32 ` [PATCH v6 04/16] target-i386: Add x86_set_hyperv Don Slutz
2012-09-24 14:32   ` [Qemu-devel] " Don Slutz
2012-10-09 16:34   ` Marcelo Tosatti
2012-10-09 17:17     ` Marcelo Tosatti
2012-10-09 17:17       ` [Qemu-devel] " Marcelo Tosatti
2012-10-09 19:12       ` Don Slutz
2012-10-09 19:12         ` [Qemu-devel] " Don Slutz
2012-10-09 19:15         ` Marcelo Tosatti
2012-10-09 19:15           ` [Qemu-devel] " Marcelo Tosatti
2012-09-24 14:32 ` [PATCH v6 05/16] target-i386: Use Hypervisor level in -machine pc,accel=kvm Don Slutz
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   ` [PATCH v6 05/16] target-i386: Use Hypervisor level in -machine pc,accel=kvm Marcelo Tosatti
2012-10-09 17:18     ` [Qemu-devel] [PATCH v6 05/16] target-i386: Use Hypervisor level in -machine pc, accel=kvm Marcelo Tosatti
2012-10-09 18:27     ` Marcelo Tosatti
2012-10-09 18:27       ` [Qemu-devel] " Marcelo Tosatti
2012-10-09 18:47       ` Marcelo Tosatti
2012-10-09 18:47         ` [Qemu-devel] " Marcelo Tosatti
2012-10-09 19:09         ` [PATCH v6 05/16] target-i386: Use Hypervisor level in -machine pc,accel=kvm Don Slutz
2012-10-09 19:09           ` [Qemu-devel] [PATCH v6 05/16] target-i386: Use Hypervisor level in -machine pc, accel=kvm Don Slutz
2012-10-09 19:11           ` [PATCH v6 05/16] target-i386: Use Hypervisor level in -machine pc,accel=kvm Marcelo Tosatti
2012-10-09 19:11             ` [Qemu-devel] [PATCH v6 05/16] target-i386: Use Hypervisor level in -machine pc, accel=kvm Marcelo Tosatti
2012-10-10 13:03             ` [PATCH v6 05/16] target-i386: Use Hypervisor level in -machine pc,accel=kvm Don Slutz
2012-10-10 13:03               ` [Qemu-devel] [PATCH v6 05/16] target-i386: Use Hypervisor level in -machine pc, accel=kvm Don Slutz
2012-10-10 14:08               ` [PATCH v6 05/16] target-i386: Use Hypervisor level in -machine pc,accel=kvm Marcelo Tosatti
2012-10-10 14:08                 ` [Qemu-devel] [PATCH v6 05/16] target-i386: Use Hypervisor level in -machine pc, accel=kvm Marcelo Tosatti
2012-09-24 14:32 ` [PATCH v6 06/16] target-i386: Use Hypervisor level in -machine pc,accel=tcg Don Slutz
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   ` [PATCH v6 06/16] target-i386: Use Hypervisor level in -machine pc,accel=tcg Marcelo Tosatti
2012-10-09 19:01     ` [Qemu-devel] [PATCH v6 06/16] target-i386: Use Hypervisor level in -machine pc, accel=tcg Marcelo Tosatti
2012-10-10 13:07     ` [PATCH v6 06/16] target-i386: Use Hypervisor level in -machine pc,accel=tcg Don Slutz
2012-10-10 13:07       ` [Qemu-devel] [PATCH v6 06/16] target-i386: Use Hypervisor level in -machine pc, accel=tcg Don Slutz
2012-09-24 14:32 ` [PATCH v6 07/16] target-i386: Add Hypervisor vendor Don Slutz
2012-09-24 14:32   ` [Qemu-devel] " Don Slutz
2012-09-24 14:32 ` [PATCH v6 08/16] target-i386: Add cpu object access routines for " Don Slutz
2012-09-24 14:32   ` [Qemu-devel] " Don Slutz
2012-10-09 19:02   ` Marcelo Tosatti
2012-10-09 19:02     ` [Qemu-devel] " Marcelo Tosatti
2012-09-24 14:32 ` Don Slutz [this message]
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 ` [PATCH v6 10/16] target-i386: Use Hypervisor vendor in -machine pc,accel=tcg Don Slutz
2012-09-24 14:32   ` [Qemu-devel] [PATCH v6 10/16] target-i386: Use Hypervisor vendor in -machine pc, accel=tcg Don Slutz
2012-09-24 14:32 ` [PATCH v6 11/16] target-i386: Add some known names to Hypervisor vendor Don Slutz
2012-09-24 14:32   ` [Qemu-devel] " Don Slutz
2012-09-24 14:32 ` [PATCH v6 12/16] target-i386: Add optional Hypervisor leaf extra Don Slutz
2012-09-24 14:32   ` [Qemu-devel] " Don Slutz
2012-09-24 14:32 ` [PATCH v6 13/16] target-i386: Add cpu object access routines for " Don Slutz
2012-09-24 14:32   ` [Qemu-devel] " Don Slutz
2012-09-24 14:32 ` [PATCH v6 14/16] target-i386: Add setting of Hypervisor leaf extra for known vmare4 Don Slutz
2012-09-24 14:32   ` [Qemu-devel] " Don Slutz
2012-10-09 19:09   ` Marcelo Tosatti
2012-10-09 19:09     ` [Qemu-devel] " Marcelo Tosatti
2012-09-24 14:32 ` [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 15/16] target-i386: Use Hypervisor leaf extra in -machine pc, accel=kvm Don Slutz
2012-09-24 14:32 ` [PATCH v6 16/16] target-i386: Use Hypervisor leaf extra in -machine pc,accel=tcg 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-10-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.