summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/hypervisor.h
diff options
context:
space:
mode:
authorSheng Yang <sheng@linux.intel.com>2010-12-21 07:18:49 +0100
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-01-07 16:03:50 +0100
commitd9b8ca8474fd4fdd43ba6d97a4fee8b49b978067 (patch)
tree465e7e44d174ce1ad6211a4fbc7d018c01dc4627 /arch/x86/include/asm/hypervisor.h
parentapic: Move hypervisor detection of x2apic to hypervisor.h (diff)
downloadlinux-d9b8ca8474fd4fdd43ba6d97a4fee8b49b978067.tar.xz
linux-d9b8ca8474fd4fdd43ba6d97a4fee8b49b978067.zip
xen: HVM X2APIC support
This patch is similiar to Gleb Natapov's patch for KVM, which enable the hypervisor to emulate x2apic feature for the guest. By this way, the emulation of lapic would be simpler with x2apic interface(MSR), and faster. [v2: Re-organized 'xen_hvm_need_lapic' per Ian Campbell suggestion] Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: Sheng Yang <sheng@linux.intel.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/include/asm/hypervisor.h')
-rw-r--r--arch/x86/include/asm/hypervisor.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/hypervisor.h b/arch/x86/include/asm/hypervisor.h
index 0c6f7af7fda8..7a15153c675d 100644
--- a/arch/x86/include/asm/hypervisor.h
+++ b/arch/x86/include/asm/hypervisor.h
@@ -21,6 +21,7 @@
#define _ASM_X86_HYPERVISOR_H
#include <asm/kvm_para.h>
+#include <asm/xen/hypervisor.h>
extern void init_hypervisor(struct cpuinfo_x86 *c);
extern void init_hypervisor_platform(void);
@@ -53,6 +54,8 @@ static inline bool hypervisor_x2apic_available(void)
{
if (kvm_para_available())
return true;
+ if (xen_x2apic_para_available())
+ return true;
return false;
}