xen: add CONFIG_XENFV_MACHINE and CONFIG_XEN_EMU options for Xen emulation

The XEN_EMU option will cover core Xen support in target/, which exists
only for x86 with KVM today but could theoretically also be implemented
on Arm/Aarch64 and with TCG or other accelerators. It will also cover
the support for architecture-independent grant table and event channel
support which will be added in hw/xen/.

The XENFV_MACHINE option is for the xenfv platform support, which will
now be used both by XEN_EMU and by real Xen.

The XEN option remains dependent on the Xen runtime libraries, and covers
support for real Xen. Some code which currently resides under CONFIG_XEN
will be moving to CONFIG_XENFV_MACHINE over time.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>

diff --git a/accel/Kconfig b/accel/Kconfig
index 8bdedb7d15f790b1f9c45678d17cd22d121202ac..41e089e6106e719e83abe02bf433c7093bd22388 100644 (file)
--- a/accel/Kconfig
+++ b/accel/Kconfig
@@ -15,6 +15,7 @@ config TCG
 
 config KVM
     bool
+    imply XEN_EMU if (I386 || X86_64)
 
 config XEN
     bool

diff --git a/hw/Kconfig b/hw/Kconfig
index 38233bbb0f137b9d7c308af62919d4a27817d18a..ba62ff6417c9c0edc5b41783dc028447f84b8413 100644 (file)
--- a/hw/Kconfig
+++ b/hw/Kconfig
@@ -41,6 +41,7 @@ source tpm/Kconfig
 source usb/Kconfig
 source virtio/Kconfig
 source vfio/Kconfig
+source xen/Kconfig
 source watchdog/Kconfig
 
 # arch Kconfig

diff --git a/hw/xen/Kconfig b/hw/xen/Kconfig
new file mode 100644 (file)
index 0000000..755c8b1
--- /dev/null
+++ b/hw/xen/Kconfig
@@ -0,0 +1,3 @@
+config XENFV_MACHINE
+    bool
+    default y if (XEN || XEN_EMU)

diff --git a/meson.build b/meson.build
index 5c6b5a1c757f9d45284193208d209ab49a2ae75b..9348cf572c0e8f46b6301faf832c08696aed9f9a 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -3828,6 +3828,7 @@ if have_system
   if xen.found()
     summary_info += {'xen ctrl version':  xen.version()}
   endif
+  summary_info += {'Xen emulation':     config_all.has_key('CONFIG_XEN_EMU')}
 endif
 summary_info += {'TCG support':       config_all.has_key('CONFIG_TCG')}
 if config_all.has_key('CONFIG_TCG')

diff --git a/target/Kconfig b/target/Kconfig
index 83da0bd2938b6f20aca8598145ca17c4b92da766..e19c9d77b50f1a8ab35aed34b62ebedbf5b872ea 100644 (file)
--- a/target/Kconfig
+++ b/target/Kconfig
@@ -18,3 +18,7 @@ source sh4/Kconfig
 source sparc/Kconfig
 source tricore/Kconfig
 source xtensa/Kconfig
+
+config XEN_EMU
+    bool
+    depends on KVM && (I386 || X86_64)