From: Anupam Chanda <achanda@nicira.com>
To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com,
x86@kernel.org, stefano.stabellini@eu.citrix.com,
jeremy.fitzhardinge@citrix.com, eddie.dong@intel.com,
linux-kernel@vger.kernel.org
Cc: achanda@nicira.com
Subject: [PATCH] Change hypervisor detection order
Date: Fri, 8 Jul 2011 11:42:50 -0700 [thread overview]
Message-ID: <1310150570-26810-1-git-send-email-achanda@nicira.com> (raw)
Detect Xen before HyperV because in Viridian compatibility mode Xen presents
itself as HyperV.
Signed-off-by: Anupam Chanda <achanda@nicira.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Yaozu (Eddie) Dong <eddie.dong@intel.com>
Reviewed-by: H. Peter Anvin <hpa@zytor.com>
---
arch/x86/kernel/cpu/hypervisor.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
index 8095f86..755f64f 100644
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/arch/x86/kernel/cpu/hypervisor.c
@@ -32,11 +32,11 @@
*/
static const __initconst struct hypervisor_x86 * const hypervisors[] =
{
- &x86_hyper_vmware,
- &x86_hyper_ms_hyperv,
#ifdef CONFIG_XEN_PVHVM
&x86_hyper_xen_hvm,
#endif
+ &x86_hyper_vmware,
+ &x86_hyper_ms_hyperv,
};
const struct hypervisor_x86 *x86_hyper;
--
1.7.2.5
next reply other threads:[~2011-07-08 18:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-08 18:42 Anupam Chanda [this message]
2011-07-09 0:01 ` [tip:x86/detect-hyper] x86, hyper: " tip-bot for Anupam Chanda
-- strict thread matches above, loose matches on Subject: below --
2011-07-07 18:19 [PATCH] " Anupam Chanda
2011-07-07 23:45 ` Dong, Eddie
2011-07-08 0:29 ` H. Peter Anvin
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=1310150570-26810-1-git-send-email-achanda@nicira.com \
--to=achanda@nicira.com \
--cc=eddie.dong@intel.com \
--cc=hpa@zytor.com \
--cc=jeremy.fitzhardinge@citrix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=stefano.stabellini@eu.citrix.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
all inboxes | Powered by JetHome®