Commit 03b2a320 authored by Juergen Gross's avatar Juergen Gross Committed by Ingo Molnar

x86/virt: Add enum for hypervisors to replace x86_hyper

The x86_hyper pointer is only used for checking whether a virtual
device is supporting the hypervisor the system is running on.

Use an enum for that purpose instead and drop the x86_hyper pointer.
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarXavier Deguillard <xdeguillard@vmware.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: akataria@vmware.com
Cc: arnd@arndb.de
Cc: boris.ostrovsky@oracle.com
Cc: devel@linuxdriverproject.org
Cc: dmitry.torokhov@gmail.com
Cc: gregkh@linuxfoundation.org
Cc: haiyangz@microsoft.com
Cc: kvm@vger.kernel.org
Cc: kys@microsoft.com
Cc: linux-graphics-maintainer@vmware.com
Cc: linux-input@vger.kernel.org
Cc: moltmann@vmware.com
Cc: pbonzini@redhat.com
Cc: pv-drivers@vmware.com
Cc: rkrcmar@redhat.com
Cc: sthemmin@microsoft.com
Cc: virtualization@lists.linux-foundation.org
Cc: xen-devel@lists.xenproject.org
Link: http://lkml.kernel.org/r/20171109132739.23465-3-jgross@suse.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent f72e38e8
...@@ -113,7 +113,7 @@ void hyperv_init(void) ...@@ -113,7 +113,7 @@ void hyperv_init(void)
u64 guest_id; u64 guest_id;
union hv_x64_msr_hypercall_contents hypercall_msr; union hv_x64_msr_hypercall_contents hypercall_msr;
if (x86_hyper != &x86_hyper_ms_hyperv) if (x86_hyper_type != X86_HYPER_MS_HYPERV)
return; return;
/* Allocate percpu VP index */ /* Allocate percpu VP index */
......
...@@ -29,6 +29,16 @@ ...@@ -29,6 +29,16 @@
/* /*
* x86 hypervisor information * 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 { struct hypervisor_x86 {
/* Hypervisor name */ /* Hypervisor name */
const char *name; const char *name;
...@@ -36,6 +46,9 @@ struct hypervisor_x86 { ...@@ -36,6 +46,9 @@ struct hypervisor_x86 {
/* Detection routine */ /* Detection routine */
uint32_t (*detect)(void); uint32_t (*detect)(void);
/* Hypervisor type */
enum x86_hypervisor_type type;
/* init time callbacks */ /* init time callbacks */
struct x86_hyper_init init; struct x86_hyper_init init;
...@@ -43,15 +56,7 @@ struct hypervisor_x86 { ...@@ -43,15 +56,7 @@ struct hypervisor_x86 {
struct x86_hyper_runtime runtime; struct x86_hyper_runtime runtime;
}; };
extern const struct hypervisor_x86 *x86_hyper; extern enum x86_hypervisor_type x86_hyper_type;
/* 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 void init_hypervisor_platform(void); extern void init_hypervisor_platform(void);
#else #else
static inline void init_hypervisor_platform(void) { } static inline void init_hypervisor_platform(void) { }
......
...@@ -26,6 +26,12 @@ ...@@ -26,6 +26,12 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/hypervisor.h> #include <asm/hypervisor.h>
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;
static const __initconst struct hypervisor_x86 * const hypervisors[] = static const __initconst struct hypervisor_x86 * const hypervisors[] =
{ {
#ifdef CONFIG_XEN_PV #ifdef CONFIG_XEN_PV
...@@ -41,8 +47,8 @@ static const __initconst struct hypervisor_x86 * const hypervisors[] = ...@@ -41,8 +47,8 @@ static const __initconst struct hypervisor_x86 * const hypervisors[] =
#endif #endif
}; };
const struct hypervisor_x86 *x86_hyper; enum x86_hypervisor_type x86_hyper_type;
EXPORT_SYMBOL(x86_hyper); EXPORT_SYMBOL(x86_hyper_type);
static inline const struct hypervisor_x86 * __init static inline const struct hypervisor_x86 * __init
detect_hypervisor_vendor(void) detect_hypervisor_vendor(void)
...@@ -87,6 +93,6 @@ void __init init_hypervisor_platform(void) ...@@ -87,6 +93,6 @@ void __init init_hypervisor_platform(void)
copy_array(&h->init, &x86_init.hyper, sizeof(h->init)); copy_array(&h->init, &x86_init.hyper, sizeof(h->init));
copy_array(&h->runtime, &x86_platform.hyper, sizeof(h->runtime)); copy_array(&h->runtime, &x86_platform.hyper, sizeof(h->runtime));
x86_hyper = h; x86_hyper_type = h->type;
x86_init.hyper.init_platform(); x86_init.hyper.init_platform();
} }
...@@ -254,9 +254,9 @@ static void __init ms_hyperv_init_platform(void) ...@@ -254,9 +254,9 @@ static void __init ms_hyperv_init_platform(void)
#endif #endif
} }
const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = { const __initconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
.name = "Microsoft Hyper-V", .name = "Microsoft Hyper-V",
.detect = ms_hyperv_platform, .detect = ms_hyperv_platform,
.type = X86_HYPER_MS_HYPERV,
.init.init_platform = ms_hyperv_init_platform, .init.init_platform = ms_hyperv_init_platform,
}; };
EXPORT_SYMBOL(x86_hyper_ms_hyperv);
...@@ -205,10 +205,10 @@ static bool __init vmware_legacy_x2apic_available(void) ...@@ -205,10 +205,10 @@ static bool __init vmware_legacy_x2apic_available(void)
(eax & (1 << VMWARE_PORT_CMD_LEGACY_X2APIC)) != 0; (eax & (1 << VMWARE_PORT_CMD_LEGACY_X2APIC)) != 0;
} }
const __refconst struct hypervisor_x86 x86_hyper_vmware = { const __initconst struct hypervisor_x86 x86_hyper_vmware = {
.name = "VMware", .name = "VMware",
.detect = vmware_platform, .detect = vmware_platform,
.type = X86_HYPER_VMWARE,
.init.init_platform = vmware_platform_setup, .init.init_platform = vmware_platform_setup,
.init.x2apic_available = vmware_legacy_x2apic_available, .init.x2apic_available = vmware_legacy_x2apic_available,
}; };
EXPORT_SYMBOL(x86_hyper_vmware);
...@@ -544,12 +544,12 @@ static uint32_t __init kvm_detect(void) ...@@ -544,12 +544,12 @@ static uint32_t __init kvm_detect(void)
return kvm_cpuid_base(); return kvm_cpuid_base();
} }
const struct hypervisor_x86 x86_hyper_kvm __refconst = { const __initconst struct hypervisor_x86 x86_hyper_kvm = {
.name = "KVM", .name = "KVM",
.detect = kvm_detect, .detect = kvm_detect,
.type = X86_HYPER_KVM,
.init.x2apic_available = kvm_para_available, .init.x2apic_available = kvm_para_available,
}; };
EXPORT_SYMBOL_GPL(x86_hyper_kvm);
static __init int activate_jump_labels(void) static __init int activate_jump_labels(void)
{ {
......
...@@ -226,12 +226,12 @@ static uint32_t __init xen_platform_hvm(void) ...@@ -226,12 +226,12 @@ static uint32_t __init xen_platform_hvm(void)
return xen_cpuid_base(); return xen_cpuid_base();
} }
const struct hypervisor_x86 x86_hyper_xen_hvm = { const __initconst struct hypervisor_x86 x86_hyper_xen_hvm = {
.name = "Xen HVM", .name = "Xen HVM",
.detect = xen_platform_hvm, .detect = xen_platform_hvm,
.type = X86_HYPER_XEN_HVM,
.init.init_platform = xen_hvm_guest_init, .init.init_platform = xen_hvm_guest_init,
.init.x2apic_available = xen_x2apic_para_available, .init.x2apic_available = xen_x2apic_para_available,
.init.init_mem_mapping = xen_hvm_init_mem_mapping, .init.init_mem_mapping = xen_hvm_init_mem_mapping,
.runtime.pin_vcpu = xen_pin_vcpu, .runtime.pin_vcpu = xen_pin_vcpu,
}; };
EXPORT_SYMBOL(x86_hyper_xen_hvm);
...@@ -1460,9 +1460,9 @@ static uint32_t __init xen_platform_pv(void) ...@@ -1460,9 +1460,9 @@ static uint32_t __init xen_platform_pv(void)
return 0; return 0;
} }
const struct hypervisor_x86 x86_hyper_xen_pv = { const __initconst struct hypervisor_x86 x86_hyper_xen_pv = {
.name = "Xen PV", .name = "Xen PV",
.detect = xen_platform_pv, .detect = xen_platform_pv,
.type = X86_HYPER_XEN_PV,
.runtime.pin_vcpu = xen_pin_vcpu, .runtime.pin_vcpu = xen_pin_vcpu,
}; };
EXPORT_SYMBOL(x86_hyper_xen_pv);
...@@ -1534,7 +1534,7 @@ static int __init hv_acpi_init(void) ...@@ -1534,7 +1534,7 @@ static int __init hv_acpi_init(void)
{ {
int ret, t; int ret, t;
if (x86_hyper != &x86_hyper_ms_hyperv) if (x86_hyper_type != X86_HYPER_MS_HYPERV)
return -ENODEV; return -ENODEV;
init_completion(&probe_event); init_completion(&probe_event);
......
...@@ -316,11 +316,9 @@ static int vmmouse_enable(struct psmouse *psmouse) ...@@ -316,11 +316,9 @@ static int vmmouse_enable(struct psmouse *psmouse)
/* /*
* Array of supported hypervisors. * Array of supported hypervisors.
*/ */
static const struct hypervisor_x86 *vmmouse_supported_hypervisors[] = { static enum x86_hypervisor_type vmmouse_supported_hypervisors[] = {
&x86_hyper_vmware, X86_HYPER_VMWARE,
#ifdef CONFIG_KVM_GUEST X86_HYPER_KVM,
&x86_hyper_kvm,
#endif
}; };
/** /**
...@@ -331,7 +329,7 @@ static bool vmmouse_check_hypervisor(void) ...@@ -331,7 +329,7 @@ static bool vmmouse_check_hypervisor(void)
int i; int i;
for (i = 0; i < ARRAY_SIZE(vmmouse_supported_hypervisors); i++) for (i = 0; i < ARRAY_SIZE(vmmouse_supported_hypervisors); i++)
if (vmmouse_supported_hypervisors[i] == x86_hyper) if (vmmouse_supported_hypervisors[i] == x86_hyper_type)
return true; return true;
return false; return false;
......
...@@ -1271,7 +1271,7 @@ static int __init vmballoon_init(void) ...@@ -1271,7 +1271,7 @@ static int __init vmballoon_init(void)
* Check if we are running on VMware's hypervisor and bail out * Check if we are running on VMware's hypervisor and bail out
* if we are not. * if we are not.
*/ */
if (x86_hyper != &x86_hyper_vmware) if (x86_hyper_type != X86_HYPER_VMWARE)
return -ENODEV; return -ENODEV;
for (is_2m_pages = 0; is_2m_pages < VMW_BALLOON_NUM_PAGE_SIZES; for (is_2m_pages = 0; is_2m_pages < VMW_BALLOON_NUM_PAGE_SIZES;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment