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>
---
configure | 10 ++++++++++
meson.build | 2 ++
Kconfig.host | 4 ++++
hw/Kconfig | 1 +
hw/remote/Kconfig | 3 +++
5 files changed, 20 insertions(+)
create mode 100644 hw/remote/Kconfig
diff --git a/configure b/configure
index c228f7c21e..9c14c482ac 100755
--- a/configure
+++ b/configure
@@ -451,6 +451,7 @@ skip_meson=no
gettext=""
fuse="auto"
fuse_lseek="auto"
+multiprocess="no"
bogus_os="no"
malloc_trim="auto"
@@ -799,6 +800,7 @@ Linux)
linux="yes"
linux_user="yes"
vhost_user="yes"
+ multiprocess="yes"
;;
esac
@@ -1535,6 +1537,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"
@@ -1862,6 +1868,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
@@ -6644,6 +6651,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 fba6413056..39df2337d3 100644
--- a/meson.build
+++ b/meson.build
@@ -925,6 +925,7 @@ kconfig_external_symbols = [
'CONFIG_VIRTFS',
'CONFIG_LINUX',
'CONFIG_PVRDMA',
+ 'CONFIG_MULTIPROCESS_ALLOWED',
]
ignored = [ 'TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_ARCH' ]
@@ -2239,6 +2240,7 @@ summary_info += {'rng-none':
config_host.has_key('CONFIG_RNG_NONE')}
summary_info += {'Linux keyring':
config_host.has_key('CONFIG_SECRET_KEYRING')}
summary_info += {'FUSE exports': fuse.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)
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 5ad3c6b5a4..525fb52506 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.25.GIT
