Il 23/07/2013 11:41, Jason Wang ha scritto: > Recent kvm has some basic support of hyperv, this will cause the guest to > identify itself as running on top of hyperv instead of kvm which will disable > kvm pv functionality. This is because we try to detect hyperv before kvm. > Solve > this by simply checking kvm in detect_hypervisor() first. > > Cc: Thomas Gleixner <t...@linutronix.de> > Cc: Ingo Molnar <mi...@redhat.com> > Cc: "H. Peter Anvin" <h...@zytor.com> > Cc: x...@kernel.org > Cc: Gleb Natapov <g...@redhat.com> > Cc: Paolo Bonzini <pbonz...@redhat.com> > Cc: K. Y. Srinivasan <k...@microsoft.com> > Signed-off-by: Jason Wang <jasow...@redhat.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 8727921..3e149b6 100644 > --- a/arch/x86/kernel/cpu/hypervisor.c > +++ b/arch/x86/kernel/cpu/hypervisor.c > @@ -36,10 +36,10 @@ static const __initconst struct hypervisor_x86 * const > hypervisors[] = > &x86_hyper_xen_hvm, > #endif > &x86_hyper_vmware, > - &x86_hyper_ms_hyperv, > #ifdef CONFIG_KVM_GUEST > &x86_hyper_kvm, > #endif > + &x86_hyper_ms_hyperv, > }; > > const struct hypervisor_x86 *x86_hyper; >
Acked-by: Paolo Bonzini <pbonz...@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
