Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 448ac44d authored by Jason Wang's avatar Jason Wang Committed by H. Peter Anvin
Browse files

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: default avatarJason Wang <jasowang@redhat.com>
Link: http://lkml.kernel.org/r/1374742475-2485-2-git-send-email-jasowang@redhat.com


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 96e39ac0

arch/x86/include/asm/xen/hypervisor.h

+1 −15
Original line number Diff line number Diff line
@@ -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