Skip to content

Commit

Permalink
xen: Switch to use hypervisor_cpuid_base()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jason Wang authored and H. Peter Anvin committed Aug 5, 2013
1 parent 96e39ac commit 448ac44
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions arch/x86/include/asm/xen/hypervisor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 448ac44

Please sign in to comment.