x86: make vmware support optional
Subsystems (9)
PATCH 1/2 x86: make vmware support optional
--- arch/x86/Kconfig | 7 +++++++ arch/x86/kernel/cpu/Makefile | 4 +++- arch/x86/kernel/cpu/hypervisor.c | 2 ++ drivers/input/mouse/Kconfig | 2 +- drivers/misc/Kconfig | 2 +- drivers/ptp/Kconfig | 2 +- 6 files changed, 15 insertions(+), 4 deletions(-)
arch/x86/Kconfig +7 -0
@@ -801,6 +801,13 @@ config X86_HV_CALLBACK_VECTOR source "arch/x86/xen/Kconfig" +config VMWARE_GUEST + bool "Vmware Guest support" + default y + help + This option enables several optimizations for running under the + VMware hypervisor. + config KVM_GUEST bool "KVM Guest support (including kvmclock)" depends on PARAVIRT
arch/x86/kernel/cpu/Makefile +3 -1
@@ -51,7 +51,9 @@ obj-$(CONFIG_X86_CPU_RESCTRL) += resctrl/ obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o -obj-$(CONFIG_HYPERVISOR_GUEST) += vmware.o hypervisor.o mshyperv.o +obj-$(CONFIG_HYPERVISOR_GUEST) += hypervisor.o mshyperv.o +obj-$(CONFIG_VMWARE_GUEST) += vmware.o + obj-$(CONFIG_ACRN_GUEST) += acrn.o ifdef CONFIG_X86_FEATURE_NAMES
arch/x86/kernel/cpu/hypervisor.c +2 -0
@@ -34,7 +34,9 @@ static const __initconst struct hypervisor_x86 * const hypervisors[] =#ifdef CONFIG_XEN_PVHVM &x86_hyper_xen_hvm,#endif +#ifdef CONFIG_VMWARE_GUEST &x86_hyper_vmware, +#endif &x86_hyper_ms_hyperv, #ifdef CONFIG_KVM_GUEST &x86_hyper_kvm,
drivers/input/mouse/Kconfig +1 -1
@@ -186,7 +186,7 @@ config MOUSE_PS2_FOCALTECH config MOUSE_PS2_VMMOUSE bool "Virtual mouse (vmmouse)" - depends on MOUSE_PS2 && X86 && HYPERVISOR_GUEST + depends on MOUSE_PS2 && X86 && VMWARE_GUEST help Say Y here if you are running under control of VMware hypervisor (ESXi, Workstation or Fusion). Also make sure that when you enable
drivers/misc/Kconfig +1 -1
@@ -363,7 +363,7 @@ config DS1682 config VMWARE_BALLOON tristate "VMware Balloon Driver" - depends on VMWARE_VMCI && X86 && HYPERVISOR_GUEST + depends on VMWARE_VMCI && X86 && VMWARE_GUEST select MEMORY_BALLOON help This is VMware physical memory management driver which acts
drivers/ptp/Kconfig +1 -1
@@ -141,7 +141,7 @@ config PTP_1588_CLOCK_IDTCM config PTP_1588_CLOCK_VMW tristate "VMware virtual PTP clock" - depends on ACPI && HYPERVISOR_GUEST && X86 + depends on ACPI && VMWARE_GUEST && X86 depends on PTP_1588_CLOCK help This driver adds support for using VMware virtual precision
Signature · 1 line
2.11.0
PATCH 2/2 x86: make hyperv support optional
--- arch/x86/Kconfig | 7 +++++++ arch/x86/kernel/cpu/Makefile | 4 ++-- arch/x86/kernel/cpu/hypervisor.c | 2 ++ drivers/hv/Kconfig | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-)
arch/x86/Kconfig +7 -0
@@ -808,6 +808,13 @@ config VMWARE_GUEST This option enables several optimizations for running under the VMware hypervisor. +config HYPERV_GUEST + bool "HyperV Guest support" + default y + help + This option enables several optimizations for running under the + HyperV hypervisor. + config KVM_GUEST bool "KVM Guest support (including kvmclock)" depends on PARAVIRT
arch/x86/kernel/cpu/Makefile +2 -2
@@ -51,9 +51,9 @@ obj-$(CONFIG_X86_CPU_RESCTRL) += resctrl/ obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o -obj-$(CONFIG_HYPERVISOR_GUEST) += hypervisor.o mshyperv.o +obj-$(CONFIG_HYPERVISOR_GUEST) += hypervisor.o obj-$(CONFIG_VMWARE_GUEST) += vmware.o - +obj-$(CONFIG_HYPERV_GUEST) += mshyperv.o obj-$(CONFIG_ACRN_GUEST) += acrn.o ifdef CONFIG_X86_FEATURE_NAMES
arch/x86/kernel/cpu/hypervisor.c +2 -0
@@ -37,7 +37,9 @@ static const __initconst struct hypervisor_x86 * const hypervisors[] =#ifdef CONFIG_VMWARE_GUEST &x86_hyper_vmware,#endif +#ifdef CONFIG_HYPERV_GUEST &x86_hyper_ms_hyperv, +#endif #ifdef CONFIG_KVM_GUEST &x86_hyper_kvm,#endif
drivers/hv/Kconfig +1 -1
@@ -4,7 +4,7 @@ menu "Microsoft Hyper-V guest support" config HYPERV tristate "Microsoft Hyper-V client drivers" - depends on X86 && ACPI && X86_LOCAL_APIC && HYPERVISOR_GUEST + depends on X86 && ACPI && X86_LOCAL_APIC && HYPERV_GUEST select PARAVIRT select X86_HV_CALLBACK_VECTOR help
Signature · 1 line
2.11.0