[PATCH 2/2] xen/Kconfig: select XEN_PVHVM
Jason Andryuk <[email protected]>
| Newsgroups | org.xenproject.lists.xen-devel,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
XEN_PVHVM cannot be disabled as it is a hidden variable with def_bool y.
Switch XEN_PVHVM to a plain bool, and make XEN_PVH and XEN_PVHVM_GUEST
select it. It will be pulled in as needed, and drop the code from
PV-only builds.
Fixes: 34aff14580d1 ("xen: Remove Xen PVH/PVHVM dependency on PCI")
Signed-off-by: Jason Andryuk <[email protected]>
---
arch/x86/xen/Kconfig | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index 99b06f5c47cd..7bdaa28ff232 100644
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -51,7 +51,7 @@ config XEN_PV_DOM0
depends on XEN_PV && XEN_DOM0
config XEN_PVHVM
- def_bool y
+ bool
depends on XEN && X86_LOCAL_APIC
config XEN_PVHVM_SMP
@@ -61,13 +61,15 @@ config XEN_PVHVM_SMP
config XEN_PVHVM_GUEST
bool "Xen PVHVM guest support"
default y
- depends on XEN_PVHVM && PCI
+ depends on XEN && PCI
+ select XEN_PVHVM
help
Support running as a Xen PVHVM guest.
config XEN_PVH
bool "Xen PVH guest support"
- depends on XEN && XEN_PVHVM && ACPI
+ depends on XEN && ACPI
+ select XEN_PVHVM
select PVH
help
Support for running as a Xen PVH guest.
--
2.55.0