From: tip-bot for Jason Wang <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
konrad.wilk@oracle.com, jasowang@redhat.com, jeremy@goop.org,
pbonzini@redhat.com, tglx@linutronix.de, hpa@linux.intel.com
Subject: [tip:x86/paravirt] xen: Switch to use hypervisor_cpuid_base()
Date: Mon, 5 Aug 2013 06:57:51 -0700 [thread overview]
Message-ID: <tip-448ac44d561f0aba5baac54bac62fe40d07230b6@git.kernel.org> (raw)
In-Reply-To: <1374742475-2485-2-git-send-email-jasowang@redhat.com>
Commit-ID: 448ac44d561f0aba5baac54bac62fe40d07230b6
Gitweb: http://git.kernel.org/tip/448ac44d561f0aba5baac54bac62fe40d07230b6
Author: Jason Wang <jasowang@redhat.com>
AuthorDate: Thu, 25 Jul 2013 16:54:33 +0800
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Mon, 5 Aug 2013 06:34:09 -0700
xen: Switch to use hypervisor_cpuid_base()
Switch to use hypervisor_cpuid_base() to detect Xen.
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Link: http://lkml.kernel.org/r/1374742475-2485-2-git-send-email-jasowang@redhat.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
arch/x86/include/asm/xen/hypervisor.h | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/arch/x86/include/asm/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h
index 125f344..d866959 100644
--- a/arch/x86/include/asm/xen/hypervisor.h
+++ b/arch/x86/include/asm/xen/hypervisor.h
@@ -40,21 +40,7 @@ extern struct start_info *xen_start_info;
static inline uint32_t xen_cpuid_base(void)
{
- uint32_t base, eax, ebx, ecx, edx;
- char signature[13];
-
- for (base = 0x40000000; base < 0x40010000; base += 0x100) {
- cpuid(base, &eax, &ebx, &ecx, &edx);
- *(uint32_t *)(signature + 0) = ebx;
- *(uint32_t *)(signature + 4) = ecx;
- *(uint32_t *)(signature + 8) = edx;
- signature[12] = 0;
-
- if (!strcmp("XenVMMXenVMM", signature) && ((eax - base) >= 2))
- return base;
- }
-
- return 0;
+ return hypervisor_cpuid_base("XenVMMXenVMM", 2);
}
#ifdef CONFIG_XEN
next prev parent reply other threads:[~2013-08-05 13:58 UTC|newest]
Thread overview: 21+ 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-07-25 8:54 ` Jason Wang
2013-08-05 13:57 ` tip-bot for Jason Wang [this message]
2013-07-25 8:54 ` [PATCH V2 3/4] kvm: " Jason Wang
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 8:54 ` Jason Wang
2013-07-25 10:56 ` KY Srinivasan
2013-07-25 10:56 ` KY Srinivasan
2013-07-25 10:56 ` KY Srinivasan
2013-08-05 3:38 ` Jason Wang
2013-08-05 3:38 ` Jason Wang
2013-08-05 14:34 ` Konrad Rzeszutek Wilk
2013-08-05 14:34 ` Konrad Rzeszutek Wilk
2013-08-05 15:20 ` H. Peter Anvin
2013-08-05 15:20 ` H. Peter Anvin
2013-08-05 16:50 ` Konrad Rzeszutek Wilk
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=tip-448ac44d561f0aba5baac54bac62fe40d07230b6@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jasowang@redhat.com \
--cc=jeremy@goop.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=pbonzini@redhat.com \
--cc=tglx@linutronix.de \
/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.