x86/kconfig: Introduce CONFIG_PV and CONFIG_HVM

Making PV and HVM guests individually compilable is useful as a reduction in
hypervisor size, and as an aid to enforcing clean API boundaries.

Introduce CONFIG_PV and CONFIG_HVM, although there is a lot of work to do
until either can actually be disabled.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 96ca2bf1abb84d79f6a175728fd9252ceb96b027..30c2769684060b95c5ebb6777a26dc594d85c276 100644 (file)
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -32,6 +32,12 @@ menu "Architecture Features"
 
 source "arch/Kconfig"
 
+config PV
+       def_bool y
+
+config HVM
+       def_bool y
+
 config SHADOW_PAGING
         bool "Shadow Paging"
         default y

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index d6980b563d8813bb3699eb0ac850e237745179e2..f75eca07f7640db1422a16d128696f062060e449 100644 (file)
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -1,10 +1,10 @@
 subdir-y += acpi
 subdir-y += cpu
 subdir-y += genapic
-subdir-y += hvm
+subdir-$(CONFIG_HVM) += hvm
 subdir-y += mm
 subdir-$(CONFIG_XENOPROF) += oprofile
-subdir-y += pv
+subdir-$(CONFIG_PV) += pv
 subdir-y += x86_64
 
 alternative-y := alternative.init.o