Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent f72e38e8

arch/x86/hyperv/hv_init.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ void hyperv_init(void) 
	u64 guest_id;

	union hv_x64_msr_hypercall_contents hypercall_msr;



	if (x86_hyper != &x86_hyper_ms_hyperv)

	if (x86_hyper_type != X86_HYPER_MS_HYPERV)

		return;



	/* Allocate percpu VP index */

arch/x86/include/asm/hypervisor.h

+14 −9
Original line number Diff line number Diff line
@@ -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) { }

arch/x86/kernel/cpu/hypervisor.c

+9 −3
Original line number Diff line number Diff line
@@ -26,6 +26,12 @@ 
#include <asm/processor.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[] =

{

#ifdef CONFIG_XEN_PV
@@ -41,8 +47,8 @@ static const __initconst struct hypervisor_x86 * const hypervisors[] = 
#endif

};



const struct hypervisor_x86 *x86_hyper;

EXPORT_SYMBOL(x86_hyper);

enum x86_hypervisor_type x86_hyper_type;

EXPORT_SYMBOL(x86_hyper_type);



static inline const struct hypervisor_x86 * __init

detect_hypervisor_vendor(void)
@@ -87,6 +93,6 @@ void __init init_hypervisor_platform(void) 
	copy_array(&h->init, &x86_init.hyper, sizeof(h->init));

	copy_array(&h->runtime, &x86_platform.hyper, sizeof(h->runtime));



	x86_hyper = h;

	x86_hyper_type = h->type;

	x86_init.hyper.init_platform();

}

arch/x86/kernel/cpu/mshyperv.c

+2 −2
Original line number Diff line number Diff line
@@ -254,9 +254,9 @@ static void __init ms_hyperv_init_platform(void) 
#endif

}



const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {

const __initconst struct hypervisor_x86 x86_hyper_ms_hyperv = {

	.name			= "Microsoft Hyper-V",

	.detect			= ms_hyperv_platform,

	.type			= X86_HYPER_MS_HYPERV,

	.init.init_platform	= ms_hyperv_init_platform,

};
 
EXPORT_SYMBOL(x86_hyper_ms_hyperv);

arch/x86/kernel/cpu/vmware.c

+2 −2
Original line number Diff line number Diff line
@@ -205,10 +205,10 @@ static bool __init vmware_legacy_x2apic_available(void) 
	       (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",

	.detect			= vmware_platform,

	.type			= X86_HYPER_VMWARE,

	.init.init_platform	= vmware_platform_setup,

	.init.x2apic_available	= vmware_legacy_x2apic_available,

};
 
EXPORT_SYMBOL(x86_hyper_vmware);