* [PULL 10/25] meson, configure: move bdrv whitelists to meson
2022-05-07 5:50 [PULL v5 00/25] Misc patches for 2022-04-29 Paolo Bonzini
@ 2022-05-07 5:50 ` Paolo Bonzini
2022-05-07 13:17 ` [PULL v5 00/25] Misc patches for 2022-04-29 Richard Henderson
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2022-05-07 5:50 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
Use the new support for string option parsing.
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 14 --------------
meson.build | 27 ++++++++++++++++-----------
meson_options.txt | 4 ++++
scripts/meson-buildoptions.sh | 8 ++++++++
4 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/configure b/configure
index 9062f9ccd6..e81ea490da 100755
--- a/configure
+++ b/configure
@@ -235,8 +235,6 @@ interp_prefix="/usr/gnemul/qemu-%M"
static="no"
cross_compile="no"
cross_prefix=""
-block_drv_rw_whitelist=""
-block_drv_ro_whitelist=""
host_cc="cc"
lto="false"
stack_protector=""
@@ -816,10 +814,6 @@ for opt do
# configure to be used by RPM and similar macros that set
# lots of directory switches by default.
;;
- --block-drv-rw-whitelist=*|--block-drv-whitelist=*) block_drv_rw_whitelist=$(echo "$optarg" | sed -e 's/,/ /g')
- ;;
- --block-drv-ro-whitelist=*) block_drv_ro_whitelist=$(echo "$optarg" | sed -e 's/,/ /g')
- ;;
--enable-debug-tcg) debug_tcg="yes"
;;
--disable-debug-tcg) debug_tcg="no"
@@ -1155,12 +1149,6 @@ Advanced options (experts only):
--disable-stack-protector disable compiler-provided stack protection
--audio-drv-list=LIST set audio drivers to try if -audiodev is not used
--block-drv-whitelist=L Same as --block-drv-rw-whitelist=L
- --block-drv-rw-whitelist=L
- set block driver read-write whitelist
- (by default affects only QEMU, not tools like qemu-img)
- --block-drv-ro-whitelist=L
- set block driver read-only whitelist
- (by default affects only QEMU, not tools like qemu-img)
--with-trace-file=NAME Full PATH,NAME of file to store traces
Default:trace-<pid>
--cpu=CPU Build for host CPU [$cpu]
@@ -2185,8 +2173,6 @@ fi
if test "$static" = "yes" ; then
echo "CONFIG_STATIC=y" >> $config_host_mak
fi
-echo "CONFIG_BDRV_RW_WHITELIST=$block_drv_rw_whitelist" >> $config_host_mak
-echo "CONFIG_BDRV_RO_WHITELIST=$block_drv_ro_whitelist" >> $config_host_mak
qemu_version=$(head $source_path/VERSION)
echo "PKGVERSION=$pkgversion" >>$config_host_mak
echo "SRC_PATH=$source_path" >> $config_host_mak
diff --git a/meson.build b/meson.build
index ae3b3a45e7..3604a0d264 100644
--- a/meson.build
+++ b/meson.build
@@ -1594,6 +1594,19 @@ have_virtfs = get_option('virtfs') \
have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools
+if get_option('block_drv_ro_whitelist') == ''
+ config_host_data.set('CONFIG_BDRV_RO_WHITELIST', '')
+else
+ config_host_data.set('CONFIG_BDRV_RO_WHITELIST',
+ '"' + get_option('block_drv_ro_whitelist').replace(',', '", "') + '", ')
+endif
+if get_option('block_drv_rw_whitelist') == ''
+ config_host_data.set('CONFIG_BDRV_RW_WHITELIST', '')
+else
+ config_host_data.set('CONFIG_BDRV_RW_WHITELIST',
+ '"' + get_option('block_drv_rw_whitelist').replace(',', '", "') + '", ')
+endif
+
foreach k : get_option('trace_backends')
config_host_data.set('CONFIG_TRACE_' + k.to_upper(), true)
endforeach
@@ -2209,16 +2222,8 @@ config_host_data.set('HAVE_VSS_SDK', have_vss_sdk)
ignored = ['CONFIG_QEMU_INTERP_PREFIX', # actually per-target
'HAVE_GDB_BIN']
-arrays = ['CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']
foreach k, v: config_host
- if ignored.contains(k)
- # do nothing
- elif arrays.contains(k)
- if v != ''
- v = '"' + '", "'.join(v.split()) + '", '
- endif
- config_host_data.set(k, v)
- elif k.startswith('CONFIG_')
+ if k.startswith('CONFIG_') and not ignored.contains(k)
config_host_data.set(k, v == 'y' ? 1 : v)
endif
endforeach
@@ -3800,8 +3805,8 @@ summary_info = {}
summary_info += {'coroutine backend': config_host['CONFIG_COROUTINE_BACKEND']}
summary_info += {'coroutine pool': have_coroutine_pool}
if have_block
- summary_info += {'Block whitelist (rw)': config_host['CONFIG_BDRV_RW_WHITELIST']}
- summary_info += {'Block whitelist (ro)': config_host['CONFIG_BDRV_RO_WHITELIST']}
+ summary_info += {'Block whitelist (rw)': get_option('block_drv_rw_whitelist')}
+ summary_info += {'Block whitelist (ro)': get_option('block_drv_ro_whitelist')}
summary_info += {'Use block whitelist in tools': get_option('block_drv_whitelist_in_tools')}
summary_info += {'VirtFS support': have_virtfs}
summary_info += {'build virtiofs daemon': have_virtiofsd}
diff --git a/meson_options.txt b/meson_options.txt
index c8e0a10d91..430674522f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -21,6 +21,10 @@ option('default_devices', type : 'boolean', value : true,
option('audio_drv_list', type: 'array', value: ['default'],
choices: ['alsa', 'coreaudio', 'default', 'dsound', 'jack', 'oss', 'pa', 'sdl'],
description: 'Set audio driver list')
+option('block_drv_rw_whitelist', type : 'string', value : '',
+ description: 'set block driver read-write whitelist (by default affects only QEMU, not tools like qemu-img)')
+option('block_drv_ro_whitelist', type : 'string', value : '',
+ description: 'set block driver read-only whitelist (by default affects only QEMU, not tools like qemu-img)')
option('fuzzing_engine', type : 'string', value : '',
description: 'fuzzing engine library for OSS-Fuzz')
option('trace_file', type: 'string', value: 'trace',
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index 3919eeec0b..d5cba2638a 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -2,6 +2,12 @@
meson_options_help() {
printf "%s\n" ' --audio-drv-list=CHOICES Set audio driver list [default] (choices:'
printf "%s\n" ' alsa/coreaudio/default/dsound/jack/oss/pa/sdl)'
+ printf "%s\n" ' --block-drv-ro-whitelist=VALUE'
+ printf "%s\n" ' set block driver read-only whitelist (by default'
+ printf "%s\n" ' affects only QEMU, not tools like qemu-img)'
+ printf "%s\n" ' --block-drv-rw-whitelist=VALUE'
+ printf "%s\n" ' set block driver read-write whitelist (by default'
+ printf "%s\n" ' affects only QEMU, not tools like qemu-img)'
printf "%s\n" ' --disable-coroutine-pool coroutine freelist (better performance)'
printf "%s\n" ' --disable-install-blobs install provided firmware blobs'
printf "%s\n" ' --enable-block-drv-whitelist-in-tools'
@@ -161,6 +167,8 @@ _meson_option_parse() {
--disable-avx2) printf "%s" -Davx2=disabled ;;
--enable-avx512f) printf "%s" -Davx512f=enabled ;;
--disable-avx512f) printf "%s" -Davx512f=disabled ;;
+ --block-drv-ro-whitelist=*) quote_sh "-Dblock_drv_ro_whitelist=$2" ;;
+ --block-drv-rw-whitelist=*) quote_sh "-Dblock_drv_rw_whitelist=$2" ;;
--enable-block-drv-whitelist-in-tools) printf "%s" -Dblock_drv_whitelist_in_tools=true ;;
--disable-block-drv-whitelist-in-tools) printf "%s" -Dblock_drv_whitelist_in_tools=false ;;
--enable-bochs) printf "%s" -Dbochs=enabled ;;
--
2.35.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PULL v5 00/25] Misc patches for 2022-04-29
2022-05-07 5:50 [PULL v5 00/25] Misc patches for 2022-04-29 Paolo Bonzini
2022-05-07 5:50 ` [PULL 10/25] meson, configure: move bdrv whitelists to meson Paolo Bonzini
@ 2022-05-07 13:17 ` Richard Henderson
1 sibling, 0 replies; 3+ messages in thread
From: Richard Henderson @ 2022-05-07 13:17 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
On 5/7/22 00:50, Paolo Bonzini wrote:
> The following changes since commit 13220a46e27ef95159651acd5e408b6aac9dbf3e:
>
> Merge tag 'vfio-updates-20220506.1' of https://gitlab.com/alex.williamson/qemu into staging (2022-05-06 16:18:14 -0500)
>
> are available in the Git repository at:
>
> https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 6033b9ecd4f6a26b78f44a94813e1e464f5b0549:
>
> pc: remove -soundhw pcspk (2022-05-07 07:46:59 +0200)
>
> ----------------------------------------------------------------
> * WHPX support for xcr0
> * qga-wss fixes
> * Meson conversions
> * Removed -soundhw pcspk
>
Applied, thanks. Please update https://wiki.qemu.org/ChangeLog/7.1 as appropriate.
r~
> ----------------------------------------------------------------
> Konstantin Kostiuk (2):
> configure: Add cross prefix for widl tool
> qga-vss: always build qga-vss.tlb when qga-vss.dll is built
>
> Paolo Bonzini (22):
> meson-buildoptions: add support for string options
> meson, configure: move Xen detection to meson
> configure, meson: move iasl detection to meson
> configure: move Windows flags detection to meson
> configure: switch string options to automatic parsing
> meson, configure: move --tls-priority to meson
> meson, configure: move bdrv whitelists to meson
> meson, configure: move --with-pkgversion, CONFIG_STAMP to meson
> meson, configure: move --interp-prefix to meson
> meson: always combine directories with prefix
> configure: switch directory options to automatic parsing
> meson: pass more options directly as -D
> configure: omit options with default values from meson command line
> meson, virtio: place all virtio-pci devices under virtio_pci_ss
> configure: simplify vhost-net-{user, vdpa} configuration
> build: move vhost-vsock configuration to Kconfig
> build: move vhost-scsi configuration to Kconfig
> build: move vhost-user-fs configuration to Kconfig
> meson: create have_vhost_* variables
> meson: use have_vhost_* variables to pick sources
> configure, meson: move vhost options to Meson
> pc: remove -soundhw pcspk
>
> Sunil Muthuswamy (1):
> WHPX: support for xcr0
>
> Kconfig.host | 3 -
> backends/meson.build | 8 +-
> configure | 673 ++----------------------
> docs/meson.build | 2 +-
> hw/audio/pcspk.c | 10 -
> hw/audio/soundhw.c | 27 +-
> hw/net/meson.build | 8 +-
> hw/scsi/Kconfig | 5 +
> hw/virtio/Kconfig | 18 +-
> hw/virtio/meson.build | 34 +-
> include/hw/audio/soundhw.h | 3 -
> include/hw/virtio/virtio-scsi.h | 2 -
> meson.build | 256 ++++++---
> meson_options.txt | 28 +-
> net/meson.build | 12 +-
> qga/vss-win32/meson.build | 4 +-
> scripts/ci/org.centos/stream/8/x86_64/configure | 3 -
> scripts/meson-buildoptions.py | 86 ++-
> scripts/meson-buildoptions.sh | 74 ++-
> scripts/qemu-stamp.py | 24 +
> scripts/xen-detect.c | 203 +++++++
> target/i386/whpx/whpx-all.c | 87 +++
> target/i386/whpx/whpx-internal.h | 3 +
> tests/meson.build | 2 +-
> tests/qtest/meson.build | 4 +-
> tools/meson.build | 2 +-
> 26 files changed, 776 insertions(+), 805 deletions(-)
> create mode 100644 scripts/qemu-stamp.py
> create mode 100644 scripts/xen-detect.c
^ permalink raw reply [flat|nested] 3+ messages in thread