From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [PATCH 4/4] x86: properly handle kvm emulation of hyperv Date: Tue, 23 Jul 2013 13:17:34 +0200 Message-ID: <51EE664E.9020203@redhat.com> References: <1374572465-15278-1-git-send-email-jasowang@redhat.com> <1374572465-15278-4-git-send-email-jasowang@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, gleb@redhat.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, "K. Y. Srinivasan" To: Jason Wang Return-path: In-Reply-To: <1374572465-15278-4-git-send-email-jasowang@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org 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 > Cc: Ingo Molnar > Cc: "H. Peter Anvin" > Cc: x86@kernel.org > Cc: Gleb Natapov > Cc: Paolo Bonzini > Cc: K. Y. Srinivasan > Signed-off-by: Jason Wang > --- > 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