1 files changed, 18 insertions, 28 deletions

diff --git a/arch/x86/include/asm/hypervisor.h b/arch/x86/include/asm/hypervisor.h
index 0ead9dbb9130..1b0a5abcd8ae 100644
--- a/arch/x86/include/asm/hypervisor.h
+++ b/arch/x86/include/asm/hypervisor.h
@@ -23,11 +23,22 @@
 #ifdef CONFIG_HYPERVISOR_GUEST
 
 #include <asm/kvm_para.h>
+#include <asm/x86_init.h>
 #include <asm/xen/hypervisor.h>
 
 /*
  * x86 hypervisor information
  */
+
+enum x86_hypervisor_type {
+        X86_HYPER_NATIVE = 0,
+        X86_HYPER_VMWARE,
+        X86_HYPER_MS_HYPERV,
+        X86_HYPER_XEN_PV,
+        X86_HYPER_XEN_HVM,
+        X86_HYPER_KVM,
+};
+
 struct hypervisor_x86 {
         /* Hypervisor name */
         const char      *name;
@@ -35,40 +46,19 @@ struct hypervisor_x86 {
         /* Detection routine */
         uint32_t        (*detect)(void);
 
-        /* Platform setup (run once per boot) */
-        void            (*init_platform)(void);
-
-        /* X2APIC detection (run once per boot) */
-        bool            (*x2apic_available)(void);
+        /* Hypervisor type */
+        enum x86_hypervisor_type type;
 
-        /* pin current vcpu to specified physical cpu (run rarely) */
-        void            (*pin_vcpu)(int);
+        /* init time callbacks */
+        struct x86_hyper_init init;
 
-        /* called during init_mem_mapping() to setup early mappings. */
-        void            (*init_mem_mapping)(void);
+        /* runtime callbacks */
+        struct x86_hyper_runtime runtime;
 };
 
-extern const struct hypervisor_x86 *x86_hyper;
-
-/* Recognized hypervisors */
-extern const struct hypervisor_x86 x86_hyper_vmware;
-extern const struct hypervisor_x86 x86_hyper_ms_hyperv;
-extern const struct hypervisor_x86 x86_hyper_xen_pv;
-extern const struct hypervisor_x86 x86_hyper_xen_hvm;
-extern const struct hypervisor_x86 x86_hyper_kvm;
-
+extern enum x86_hypervisor_type x86_hyper_type;
 extern void init_hypervisor_platform(void);
-extern bool hypervisor_x2apic_available(void);
-extern void hypervisor_pin_vcpu(int cpu);
-
-static inline void hypervisor_init_mem_mapping(void)
-{
-        if (x86_hyper && x86_hyper->init_mem_mapping)
-                x86_hyper->init_mem_mapping();
-}
 #else
 static inline void init_hypervisor_platform(void) { }
-static inline bool hypervisor_x2apic_available(void) { return false; }
-static inline void hypervisor_init_mem_mapping(void) { }
 #endif /* CONFIG_HYPERVISOR_GUEST */
 #endif /* _ASM_X86_HYPERVISOR_H */