diff options
| author | Jason Wang <jasowang@redhat.com> | 2013-07-25 16:54:33 +0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-08-05 06:34:09 -0700 |
| commit | 448ac44d561f0aba5baac54bac62fe40d07230b6 (patch) | |
| tree | 74fc1954e449654b6c0155a4116378b9a30aa844 /arch/x86/include | |
| parent | 96e39ac0e9d18020c8c5a41b64b8fe86c26575ab (diff) | |
| download | blackbird-op-linux-448ac44d561f0aba5baac54bac62fe40d07230b6.tar.gz blackbird-op-linux-448ac44d561f0aba5baac54bac62fe40d07230b6.zip | |
xen: Switch to use hypervisor_cpuid_base()
Switch to use hypervisor_cpuid_base() to detect Xen.
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Link: http://lkml.kernel.org/r/1374742475-2485-2-git-send-email-jasowang@redhat.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | 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 125f344f06a9..d866959e5685 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 |
