From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH 2/4] xen: switch to use hypervisor_cpuid_base() Date: Tue, 23 Jul 2013 11:55:04 -0400 Message-ID: <20130723155504.GA5328@phenom.dumpdata.com> References: <1374572465-15278-1-git-send-email-jasowang@redhat.com> <1374572465-15278-2-git-send-email-jasowang@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1374572465-15278-2-git-send-email-jasowang@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: Jason Wang Cc: Jeremy Fitzhardinge , xen-devel@lists.xensource.com, kvm@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, mingo@redhat.com, hpa@zytor.com, pbonzini@redhat.com, tglx@linutronix.de List-Id: virtualization@lists.linuxfoundation.org On Tue, Jul 23, 2013 at 05:41:03PM +0800, Jason Wang wrote: > Switch to use hypervisor_cpuid_base() to detect Xen. > > Cc: Konrad Rzeszutek Wilk Acked-by: Konrad Rzeszutek Wilk > Cc: Jeremy Fitzhardinge > Cc: Thomas Gleixner > Cc: Ingo Molnar > Cc: "H. Peter Anvin" > Cc: x86@kernel.org > Cc: Paolo Bonzini > Cc: xen-devel@lists.xensource.com > Cc: virtualization@lists.linux-foundation.org > Signed-off-by: Jason Wang > --- > arch/x86/include/asm/xen/hypervisor.h | 16 +--------------- > 1 files changed, 1 insertions(+), 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 > -- > 1.7.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ >