|
@@ -20,16 +20,7 @@
|
|
|
#ifndef _ASM_X86_HYPERVISOR_H
|
|
|
#define _ASM_X86_HYPERVISOR_H
|
|
|
|
|
|
-#ifdef CONFIG_HYPERVISOR_GUEST
|
|
|
-
|
|
|
-#include <asm/kvm_para.h>
|
|
|
-#include <asm/x86_init.h>
|
|
|
-#include <asm/xen/hypervisor.h>
|
|
|
-
|
|
|
-/*
|
|
|
- * x86 hypervisor information
|
|
|
- */
|
|
|
-
|
|
|
+/* x86 hypervisor types */
|
|
|
enum x86_hypervisor_type {
|
|
|
X86_HYPER_NATIVE = 0,
|
|
|
X86_HYPER_VMWARE,
|
|
@@ -39,6 +30,12 @@ enum x86_hypervisor_type {
|
|
|
X86_HYPER_KVM,
|
|
|
};
|
|
|
|
|
|
+#ifdef CONFIG_HYPERVISOR_GUEST
|
|
|
+
|
|
|
+#include <asm/kvm_para.h>
|
|
|
+#include <asm/x86_init.h>
|
|
|
+#include <asm/xen/hypervisor.h>
|
|
|
+
|
|
|
struct hypervisor_x86 {
|
|
|
/* Hypervisor name */
|
|
|
const char *name;
|
|
@@ -58,7 +55,15 @@ struct hypervisor_x86 {
|
|
|
|
|
|
extern enum x86_hypervisor_type x86_hyper_type;
|
|
|
extern void init_hypervisor_platform(void);
|
|
|
+static inline bool hypervisor_is_type(enum x86_hypervisor_type type)
|
|
|
+{
|
|
|
+ return x86_hyper_type == type;
|
|
|
+}
|
|
|
#else
|
|
|
static inline void init_hypervisor_platform(void) { }
|
|
|
+static inline bool hypervisor_is_type(enum x86_hypervisor_type type)
|
|
|
+{
|
|
|
+ return type == X86_HYPER_NATIVE;
|
|
|
+}
|
|
|
#endif /* CONFIG_HYPERVISOR_GUEST */
|
|
|
#endif /* _ASM_X86_HYPERVISOR_H */
|