All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] x86: make vmware support optional
@ 2020-11-17 20:23 Enrico Weigelt, metux IT consult
  2020-11-17 20:23 ` [PATCH 2/2] x86: make hyperv " Enrico Weigelt, metux IT consult
  2020-11-17 20:31 ` [PATCH 1/2] x86: make vmware " Borislav Petkov
  0 siblings, 2 replies; 7+ messages in thread
From: Enrico Weigelt, metux IT consult @ 2020-11-17 20:23 UTC (permalink / raw)
  To: linux-kernel
  Cc: tglx, mingo, bp, x86, hpa, dmitry.torokhov, derek.kiernan,
	dragan.cvetic, richardcochran, linux-hyperv, linux-input, netdev

Make it possible to opt-out from vmware support

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 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(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index f6946b81f74a..c227c1fa0091 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -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
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 93792b457b81..a615b0152bf0 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -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
diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
index 553bfbfc3a1b..c0e770a224aa 100644
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/arch/x86/kernel/cpu/hypervisor.c
@@ -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,
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index d8b6a5dab190..29ced69d5c85 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -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
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index fafa8b0d8099..d2bd8eff6eb6 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -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
diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
index 942f72d8151d..6bf30153270e 100644
--- a/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@ -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
-- 
2.11.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/2] x86: make hyperv support optional
  2020-11-17 20:23 [PATCH 1/2] x86: make vmware support optional Enrico Weigelt, metux IT consult
@ 2020-11-17 20:23 ` Enrico Weigelt, metux IT consult
  2020-11-18  9:23   ` Wei Liu
  2020-11-17 20:31 ` [PATCH 1/2] x86: make vmware " Borislav Petkov
  1 sibling, 1 reply; 7+ messages in thread
From: Enrico Weigelt, metux IT consult @ 2020-11-17 20:23 UTC (permalink / raw)
  To: linux-kernel
  Cc: tglx, mingo, bp, x86, hpa, dmitry.torokhov, derek.kiernan,
	dragan.cvetic, richardcochran, linux-hyperv, linux-input, netdev

Make it possible to opt-out from hyperv support.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 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(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c227c1fa0091..60aab344d6ab 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -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
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index a615b0152bf0..5536b801cb44 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -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
diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
index c0e770a224aa..32d6b2084d05 100644
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/arch/x86/kernel/cpu/hypervisor.c
@@ -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
diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig
index 79e5356a737a..7b3094c59a81 100644
--- a/drivers/hv/Kconfig
+++ b/drivers/hv/Kconfig
@@ -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
-- 
2.11.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/2] x86: make vmware support optional
  2020-11-17 20:23 [PATCH 1/2] x86: make vmware support optional Enrico Weigelt, metux IT consult
  2020-11-17 20:23 ` [PATCH 2/2] x86: make hyperv " Enrico Weigelt, metux IT consult
@ 2020-11-17 20:31 ` Borislav Petkov
  2020-12-02 19:17   ` Enrico Weigelt, metux IT consult
  1 sibling, 1 reply; 7+ messages in thread
From: Borislav Petkov @ 2020-11-17 20:31 UTC (permalink / raw)
  To: Enrico Weigelt, metux IT consult
  Cc: linux-kernel, tglx, mingo, x86, hpa, dmitry.torokhov,
	derek.kiernan, dragan.cvetic, richardcochran, linux-hyperv,
	linux-input, netdev

On Tue, Nov 17, 2020 at 09:23:07PM +0100, Enrico Weigelt, metux IT consult wrote:
> Make it possible to opt-out from vmware support

Why?

I can think of a couple of reasons but maybe yours might not be the one
I'm thinking of.

> Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
> ---
>  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(-)
> 
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index f6946b81f74a..c227c1fa0091 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -801,6 +801,13 @@ config X86_HV_CALLBACK_VECTOR
>  
>  source "arch/x86/xen/Kconfig"
>  
> +config VMWARE_GUEST
> +	bool "Vmware Guest support"
> +	default y

depends on HYPERVISOR_GUEST. The hyperv one too.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] x86: make hyperv support optional
  2020-11-17 20:23 ` [PATCH 2/2] x86: make hyperv " Enrico Weigelt, metux IT consult
@ 2020-11-18  9:23   ` Wei Liu
  0 siblings, 0 replies; 7+ messages in thread
From: Wei Liu @ 2020-11-18  9:23 UTC (permalink / raw)
  To: Enrico Weigelt, metux IT consult
  Cc: linux-kernel, tglx, mingo, bp, x86, hpa, dmitry.torokhov,
	derek.kiernan, dragan.cvetic, richardcochran, linux-hyperv,
	linux-input, netdev, Wei Liu

On Tue, Nov 17, 2020 at 09:23:08PM +0100, Enrico Weigelt, metux IT consult wrote:
> Make it possible to opt-out from hyperv support.
> 

"Hyper-V support".

Have you tested this patch? If so, how?

> Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
> ---
>  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(-)
> 
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index c227c1fa0091..60aab344d6ab 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -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"

Hyper-V here.

> +	default y
> +	help
> +	  This option enables several optimizations for running under the
> +	  HyperV hypervisor.
> +

"for running under Hyper-V".

>  config KVM_GUEST
>  	bool "KVM Guest support (including kvmclock)"
>  	depends on PARAVIRT
> diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
> index a615b0152bf0..5536b801cb44 100644
> --- a/arch/x86/kernel/cpu/Makefile
> +++ b/arch/x86/kernel/cpu/Makefile
> @@ -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
> diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
> index c0e770a224aa..32d6b2084d05 100644
> --- a/arch/x86/kernel/cpu/hypervisor.c
> +++ b/arch/x86/kernel/cpu/hypervisor.c
> @@ -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
> diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig
> index 79e5356a737a..7b3094c59a81 100644
> --- a/drivers/hv/Kconfig
> +++ b/drivers/hv/Kconfig
> @@ -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

Maybe that one should be moved to x86/Kconfig and used instead?

Wei.

> -- 
> 2.11.0
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/2] x86: make vmware support optional
  2020-11-17 20:31 ` [PATCH 1/2] x86: make vmware " Borislav Petkov
@ 2020-12-02 19:17   ` Enrico Weigelt, metux IT consult
  2020-12-02 19:22     ` Borislav Petkov
  0 siblings, 1 reply; 7+ messages in thread
From: Enrico Weigelt, metux IT consult @ 2020-12-02 19:17 UTC (permalink / raw)
  To: Borislav Petkov, Enrico Weigelt, metux IT consult
  Cc: linux-kernel, tglx, mingo, x86, hpa, dmitry.torokhov,
	derek.kiernan, dragan.cvetic, richardcochran, linux-hyperv,
	linux-input, netdev

On 17.11.20 21:31, Borislav Petkov wrote:
> On Tue, Nov 17, 2020 at 09:23:07PM +0100, Enrico Weigelt, metux IT consult wrote:
>> Make it possible to opt-out from vmware support
> 
> Why?

Reducing the kernel size. Think of very high density virtualization
(w/ specially stripped-down workloads) or embedded systems.

For example, I'm running bare minimum kernels w/ only kvm and virtio
(not even pci, etc) in such scenarios.

Of course, that's nothing for an average distro, therefore leaving
default y.


--mtx


> 
> I can think of a couple of reasons but maybe yours might not be the one
> I'm thinking of.
> 
>> Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
>> ---
>>  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(-)
>>
>> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
>> index f6946b81f74a..c227c1fa0091 100644
>> --- a/arch/x86/Kconfig
>> +++ b/arch/x86/Kconfig
>> @@ -801,6 +801,13 @@ config X86_HV_CALLBACK_VECTOR
>>  
>>  source "arch/x86/xen/Kconfig"
>>  
>> +config VMWARE_GUEST
>> +	bool "Vmware Guest support"
>> +	default y
> 
> depends on HYPERVISOR_GUEST. The hyperv one too.
> 

-- 
---
Hinweis: unverschlüsselte E-Mails können leicht abgehört und manipuliert
werden ! Für eine vertrauliche Kommunikation senden Sie bitte ihren
GPG/PGP-Schlüssel zu.
---
Enrico Weigelt, metux IT consult
Free software and Linux embedded engineering
info@metux.net -- +49-151-27565287

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/2] x86: make vmware support optional
  2020-12-02 19:17   ` Enrico Weigelt, metux IT consult
@ 2020-12-02 19:22     ` Borislav Petkov
  0 siblings, 0 replies; 7+ messages in thread
From: Borislav Petkov @ 2020-12-02 19:22 UTC (permalink / raw)
  To: Enrico Weigelt, metux IT consult
  Cc: Enrico Weigelt, metux IT consult, linux-kernel, tglx, mingo, x86,
	hpa, dmitry.torokhov, derek.kiernan, dragan.cvetic,
	richardcochran, linux-hyperv, linux-input, netdev

On Wed, Dec 02, 2020 at 08:17:23PM +0100, Enrico Weigelt, metux IT consult wrote:
> Reducing the kernel size. Think of very high density virtualization
> (w/ specially stripped-down workloads) or embedded systems.
> 
> For example, I'm running bare minimum kernels w/ only kvm and virtio
> (not even pci, etc) in such scenarios.
> 
> Of course, that's nothing for an average distro, therefore leaving
> default y.

Ok, pls put the reasoning for the change in the next revision's commit
message along with how much KB savings we're talking about.

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/2] x86: make vmware support optional
@ 2020-11-17 20:21 Enrico Weigelt, metux IT consult
  0 siblings, 0 replies; 7+ messages in thread
From: Enrico Weigelt, metux IT consult @ 2020-11-17 20:21 UTC (permalink / raw)
  To: linux-kernel
  Cc: tglx, mingo, bp, x86, hpa, dmitry.torokhov, derek.kiernan,
	dragan.cvetic, richardcochran, linux-hyperv, linux-input, netdev

---
 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(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index f6946b81f74a..c227c1fa0091 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -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
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 93792b457b81..a615b0152bf0 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -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
diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
index 553bfbfc3a1b..c0e770a224aa 100644
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/arch/x86/kernel/cpu/hypervisor.c
@@ -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,
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index d8b6a5dab190..29ced69d5c85 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -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
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index fafa8b0d8099..d2bd8eff6eb6 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -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
diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
index 942f72d8151d..6bf30153270e 100644
--- a/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@ -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
-- 
2.11.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-12-02 19:23 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-17 20:23 [PATCH 1/2] x86: make vmware support optional Enrico Weigelt, metux IT consult
2020-11-17 20:23 ` [PATCH 2/2] x86: make hyperv " Enrico Weigelt, metux IT consult
2020-11-18  9:23   ` Wei Liu
2020-11-17 20:31 ` [PATCH 1/2] x86: make vmware " Borislav Petkov
2020-12-02 19:17   ` Enrico Weigelt, metux IT consult
2020-12-02 19:22     ` Borislav Petkov
  -- strict thread matches above, loose matches on Subject: below --
2020-11-17 20:21 Enrico Weigelt, metux IT consult

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.