From: Jagannathan Raman <jag.ra...@oracle.com>
Add configuration options to enable or disable multiprocess QEMU code
Signed-off-by: John G Johnson <john.g.john...@oracle.com>
Signed-off-by: Jagannathan Raman <jag.ra...@oracle.com>
Signed-off-by: Elena Ufimtseva <elena.ufimts...@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com>
Message-id:
6cc37253e35418ebd7b675a31a3df6e3c7a12dc1.1611938319.git.jag.ra...@oracle.com
Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com>
---
configure | 10 ++++++++++
meson.build | 4 +++-
Kconfig.host | 4 ++++
hw/Kconfig | 1 +
hw/remote/Kconfig | 3 +++
5 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 hw/remote/Kconfig
diff --git a/configure b/configure
index e85d6baf8f..a73869860b 100755
--- a/configure
+++ b/configure
@@ -463,6 +463,7 @@ skip_meson=no
gettext="auto"
fuse="auto"
fuse_lseek="auto"
+multiprocess="no"
malloc_trim="auto"
@@ -797,6 +798,7 @@ Linux)
linux="yes"
linux_user="yes"
vhost_user=${default_feature:-yes}
+ multiprocess=${default_feature:-yes}
;;
esac
@@ -1556,6 +1558,10 @@ for opt do
;;
--disable-fuse-lseek) fuse_lseek="disabled"
;;
+ --enable-multiprocess) multiprocess="yes"
+ ;;
+ --disable-multiprocess) multiprocess="no"
+ ;;
*)
echo "ERROR: unknown option $opt"
echo "Try '$0 --help' for more information"
@@ -1908,6 +1914,7 @@ disabled with --disable-FEATURE, default is enabled if
available
libdaxctl libdaxctl support
fuse FUSE block device export
fuse-lseek SEEK_HOLE/SEEK_DATA support for FUSE exports
+ multiprocess Multiprocess QEMU support
NOTE: The object files are built at the place where configure is launched
EOF
@@ -6082,6 +6089,9 @@ fi
if test "$have_mlockall" = "yes" ; then
echo "HAVE_MLOCKALL=y" >> $config_host_mak
fi
+if test "$multiprocess" = "yes" ; then
+ echo "CONFIG_MULTIPROCESS_ALLOWED=y" >> $config_host_mak
+fi
if test "$fuzzing" = "yes" ; then
# If LIB_FUZZING_ENGINE is set, assume we are running on OSS-Fuzz, and the
# needed CFLAGS have already been provided
diff --git a/meson.build b/meson.build
index 2d8b433ff0..7a7283a97d 100644
--- a/meson.build
+++ b/meson.build
@@ -1210,7 +1210,8 @@ host_kconfig = \
('CONFIG_VHOST_KERNEL' in config_host ? ['CONFIG_VHOST_KERNEL=y'] : []) + \
(have_virtfs ? ['CONFIG_VIRTFS=y'] : []) + \
('CONFIG_LINUX' in config_host ? ['CONFIG_LINUX=y'] : []) + \
- ('CONFIG_PVRDMA' in config_host ? ['CONFIG_PVRDMA=y'] : [])
+ ('CONFIG_PVRDMA' in config_host ? ['CONFIG_PVRDMA=y'] : []) + \
+ ('CONFIG_MULTIPROCESS_ALLOWED' in config_host ?
['CONFIG_MULTIPROCESS_ALLOWED=y'] : [])
ignored = [ 'TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_ARCH' ]
@@ -2626,6 +2627,7 @@ summary_info += {'libpmem support':
config_host.has_key('CONFIG_LIBPMEM')}
summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')}
summary_info += {'libudev': libudev.found()}
summary_info += {'FUSE lseek': fuse_lseek.found()}
+summary_info += {'Multiprocess QEMU':
config_host.has_key('CONFIG_MULTIPROCESS_ALLOWED')}
summary(summary_info, bool_yn: true, section: 'Dependencies')
if not supported_cpus.contains(cpu)
diff --git a/Kconfig.host b/Kconfig.host
index a9a55a9c31..24255ef441 100644
--- a/Kconfig.host
+++ b/Kconfig.host
@@ -37,3 +37,7 @@ config VIRTFS
config PVRDMA
bool
+
+config MULTIPROCESS_ALLOWED
+ bool
+ imply MULTIPROCESS
diff --git a/hw/Kconfig b/hw/Kconfig
index d4cec9e476..8ea26479c4 100644
--- a/hw/Kconfig
+++ b/hw/Kconfig
@@ -27,6 +27,7 @@ source pci-host/Kconfig
source pcmcia/Kconfig
source pci/Kconfig
source rdma/Kconfig
+source remote/Kconfig
source rtc/Kconfig
source scsi/Kconfig
source sd/Kconfig
diff --git a/hw/remote/Kconfig b/hw/remote/Kconfig
new file mode 100644
index 0000000000..54844467a0
--- /dev/null
+++ b/hw/remote/Kconfig
@@ -0,0 +1,3 @@
+config MULTIPROCESS
+ bool
+ depends on PCI && KVM
--
2.29.2
