* [PATCH] Change hypervisor detection order
@ 2011-07-07 18:19 Anupam Chanda
2011-07-07 23:45 ` Dong, Eddie
2011-07-08 0:29 ` H. Peter Anvin
0 siblings, 2 replies; 4+ messages in thread
From: Anupam Chanda @ 2011-07-07 18:19 UTC (permalink / raw)
To: tglx, mingo, hpa, x86, stefano.stabellini, jeremy.fitzhardinge,
eddie.dong, linux-kernel
Cc: achanda
Detect Xen before HyperV because in Viridian compatibility mode Xen presents
itself as HyperV.
Signed-off-by: Anupam Chanda <achanda@nicira.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
arch/x86/kernel/cpu/hypervisor.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
index 8095f86..ca23091 100644
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/arch/x86/kernel/cpu/hypervisor.c
@@ -33,10 +33,10 @@
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_ms_hyperv,
};
const struct hypervisor_x86 *x86_hyper;
--
1.7.2.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH] Change hypervisor detection order
2011-07-07 18:19 [PATCH] Change hypervisor detection order Anupam Chanda
@ 2011-07-07 23:45 ` Dong, Eddie
2011-07-08 0:29 ` H. Peter Anvin
1 sibling, 0 replies; 4+ messages in thread
From: Dong, Eddie @ 2011-07-07 23:45 UTC (permalink / raw)
To: Anupam Chanda, tglx@linutronix.de, mingo@redhat.com,
hpa@zytor.com, x86@kernel.org, stefano.stabellini@eu.citrix.com,
jeremy.fitzhardinge@citrix.com, linux-kernel@vger.kernel.org
Cc: Dong, Eddie
Sounds good.
Eddie
> -----Original Message-----
> From: Anupam Chanda [mailto:achanda@nicira.com]
> Sent: Friday, July 08, 2011 2:20 AM
> To: tglx@linutronix.de; mingo@redhat.com; hpa@zytor.com;
> x86@kernel.org; stefano.stabellini@eu.citrix.com;
> jeremy.fitzhardinge@citrix.com; Dong, Eddie; linux-kernel@vger.kernel.org
> Cc: achanda@nicira.com
> Subject: [PATCH] Change hypervisor detection order
>
> Detect Xen before HyperV because in Viridian compatibility mode Xen
> presents
> itself as HyperV.
>
> Signed-off-by: Anupam Chanda <achanda@nicira.com>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> ---
> arch/x86/kernel/cpu/hypervisor.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/hypervisor.c
> b/arch/x86/kernel/cpu/hypervisor.c
> index 8095f86..ca23091 100644
> --- a/arch/x86/kernel/cpu/hypervisor.c
> +++ b/arch/x86/kernel/cpu/hypervisor.c
> @@ -33,10 +33,10 @@
> 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_ms_hyperv,
> };
>
> const struct hypervisor_x86 *x86_hyper;
> --
> 1.7.2.5
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Change hypervisor detection order
2011-07-07 18:19 [PATCH] Change hypervisor detection order Anupam Chanda
2011-07-07 23:45 ` Dong, Eddie
@ 2011-07-08 0:29 ` H. Peter Anvin
1 sibling, 0 replies; 4+ messages in thread
From: H. Peter Anvin @ 2011-07-08 0:29 UTC (permalink / raw)
To: Anupam Chanda
Cc: tglx, mingo, x86, stefano.stabellini, jeremy.fitzhardinge,
eddie.dong, linux-kernel
On 07/07/2011 11:19 AM, Anupam Chanda wrote:
> Detect Xen before HyperV because in Viridian compatibility mode Xen presents
> itself as HyperV.
>
> Signed-off-by: Anupam Chanda <achanda@nicira.com>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> ---
> arch/x86/kernel/cpu/hypervisor.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
> index 8095f86..ca23091 100644
> --- a/arch/x86/kernel/cpu/hypervisor.c
> +++ b/arch/x86/kernel/cpu/hypervisor.c
> @@ -33,10 +33,10 @@
> 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_ms_hyperv,
> };
>
> const struct hypervisor_x86 *x86_hyper;
Any reason to not hoist it to the top? I'm guessing Xen emulating
VMware is more likely than the opposite...
-hpa
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] Change hypervisor detection order
@ 2011-07-08 18:42 Anupam Chanda
0 siblings, 0 replies; 4+ messages in thread
From: Anupam Chanda @ 2011-07-08 18:42 UTC (permalink / raw)
To: tglx, mingo, hpa, x86, stefano.stabellini, jeremy.fitzhardinge,
eddie.dong, linux-kernel
Cc: achanda
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-07-08 18:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-07 18:19 [PATCH] Change hypervisor detection order Anupam Chanda
2011-07-07 23:45 ` Dong, Eddie
2011-07-08 0:29 ` H. Peter Anvin
-- strict thread matches above, loose matches on Subject: below --
2011-07-08 18:42 Anupam Chanda
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox