1 files changed, 14 insertions, 9 deletions

diff --git a/arch/x86/include/asm/hypervisor.h b/arch/x86/include/asm/hypervisor.h
index 0eca7239a7aa..1b0a5abcd8ae 100644
--- a/arch/x86/include/asm/hypervisor.h
+++ b/arch/x86/include/asm/hypervisor.h
@@ -29,6 +29,16 @@
 /*
  * 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;
@@ -36,6 +46,9 @@ struct hypervisor_x86 {
         /* Detection routine */
         uint32_t        (*detect)(void);
 
+        /* Hypervisor type */
+        enum x86_hypervisor_type type;
+
         /* init time callbacks */
         struct x86_hyper_init init;
 
@@ -43,15 +56,7 @@ struct hypervisor_x86 {
         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);
 #else
 static inline void init_hypervisor_platform(void) { }