From: Jason Wang <jasowang@redhat.com>
To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com,
x86@kernel.org, linux-kernel@vger.kernel.org,
pbonzini@redhat.com
Cc: kvm@vger.kernel.org, Jason Wang <jasowang@redhat.com>,
Gleb Natapov <gleb@redhat.com>
Subject: [PATCH V2 3/4] kvm: switch to use hypervisor_cpuid_base()
Date: Thu, 25 Jul 2013 16:54:34 +0800 [thread overview]
Message-ID: <1374742475-2485-3-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1374742475-2485-1-git-send-email-jasowang@redhat.com>
Switch to use hypervisor_cpuid_base() to detect KVM.
Cc: Gleb Natapov <gleb@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: kvm@vger.kernel.org
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
Changes from V1:
- Introduce kvm_cpuid_base() which will be used by next patch.
---
arch/x86/include/asm/kvm_para.h | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/arch/x86/include/asm/kvm_para.h b/arch/x86/include/asm/kvm_para.h
index 695399f..0644129 100644
--- a/arch/x86/include/asm/kvm_para.h
+++ b/arch/x86/include/asm/kvm_para.h
@@ -85,26 +85,20 @@ static inline long kvm_hypercall4(unsigned int nr, unsigned long p1,
return ret;
}
-static inline bool kvm_para_available(void)
+static inline uint32_t kvm_cpuid_base(void)
{
- unsigned int eax, ebx, ecx, edx;
- char signature[13];
-
if (boot_cpu_data.cpuid_level < 0)
- return false; /* So we don't blow up on old processors */
+ return 0; /* So we don't blow up on old processors */
- if (cpu_has_hypervisor) {
- cpuid(KVM_CPUID_SIGNATURE, &eax, &ebx, &ecx, &edx);
- memcpy(signature + 0, &ebx, 4);
- memcpy(signature + 4, &ecx, 4);
- memcpy(signature + 8, &edx, 4);
- signature[12] = 0;
+ if (cpu_has_hypervisor)
+ return hypervisor_cpuid_base("KVMKVMKVM\0\0\0", 0);
- if (strcmp(signature, "KVMKVMKVM") == 0)
- return true;
- }
+ return 0;
+}
- return false;
+static inline bool kvm_para_available(void)
+{
+ return kvm_cpuid_base() != 0;
}
static inline unsigned int kvm_arch_para_features(void)
--
1.7.1
next prev parent reply other threads:[~2013-07-25 9:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-25 8:54 [PATCH V2 1/4] x86: introduce hypervisor_cpuid_base() Jason Wang
2013-07-25 8:54 ` [PATCH V2 2/4] xen: switch to use hypervisor_cpuid_base() Jason Wang
2013-08-05 13:57 ` [tip:x86/paravirt] xen: Switch " tip-bot for Jason Wang
2013-07-25 8:54 ` Jason Wang [this message]
2013-08-05 13:58 ` [tip:x86/paravirt] x86, kvm: Switch to use hypervisor_cpuid_base( ) tip-bot for Jason Wang
2013-07-25 8:54 ` [PATCH V2 4/4] x86: correctly detect hypervisor Jason Wang
2013-07-25 10:56 ` KY Srinivasan
2013-08-05 3:38 ` Jason Wang
2013-08-05 14:34 ` Konrad Rzeszutek Wilk
2013-08-05 15:20 ` H. Peter Anvin
2013-08-05 16:50 ` Konrad Rzeszutek Wilk
2013-08-05 13:58 ` [tip:x86/paravirt] x86: Correctly " tip-bot for Jason Wang
2013-08-05 13:57 ` [tip:x86/paravirt] x86: Introduce hypervisor_cpuid_base() tip-bot for Jason Wang
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=1374742475-2485-3-git-send-email-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=gleb@redhat.com \
--cc=hpa@zytor.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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).