Merge tag 'pull-maintainer-may24-160524-2' of https://gitlab.com/stsquad/qemu into...

[mirror_qemu.git] / Kconfig.host

diff --git a/Kconfig.host b/Kconfig.host
index a6d871c399d000cafc99b0427ea025e1b8b99c9c..17f405004b3bc765890688304322a1937ca8c01c 100644 (file)
--- a/Kconfig.host
+++ b/Kconfig.host
@@ -1,6 +1,6 @@
 # These are "proxy" symbols used to pass config-host.mak values
-# down to Kconfig.  See also MINIKCONF_ARGS in the Makefile:
-# these two need to be kept in sync.
+# down to Kconfig.  See also kconfig_external_symbols in
+# meson.build: these two need to be kept in sync.
 
 config LINUX
     bool
@@ -11,6 +11,9 @@ config OPENGL
 config X11
     bool
 
+config PIXMAN
+    bool
+
 config SPICE
     bool
 
@@ -20,16 +23,32 @@ config IVSHMEM
 config TPM
     bool
 
+config FDT
+    bool
+
 config VHOST_USER
     bool
-    select VHOST
+
+config VHOST_VDPA
+    bool
 
 config VHOST_KERNEL
     bool
-    select VHOST
 
 config VIRTFS
     bool
 
-config PVRDMA
+config MULTIPROCESS_ALLOWED
+    bool
+    imply MULTIPROCESS
+
+config FUZZ
+    bool
+    select SPARSE_MEM
+
+config VFIO_USER_SERVER_ALLOWED
+    bool
+    imply VFIO_USER_SERVER
+
+config HV_BALLOON_POSSIBLE
     bool