On Thu, Dec 17, 2020 at 1:41 PM Paolo Bonzini <pbonz...@redhat.com> wrote:
> Pass the boolean option directly instead of writing
> CONFIG_MINIKCONF_MODE to config-host.mak.
>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
---
> configure | 13 ++++---------
> meson.build | 5 +++--
> meson_options.txt | 2 ++
> 3 files changed, 9 insertions(+), 11 deletions(-)
>
> diff --git a/configure b/configure
> index 420663d69a..ab4b826755 100755
> --- a/configure
> +++ b/configure
> @@ -447,7 +447,7 @@ sheepdog="no"
> libxml2="$default_feature"
> debug_mutex="no"
> libpmem="$default_feature"
> -default_devices="yes"
> +default_devices="true"
> plugins="no"
> fuzzing="no"
> rng_none="no"
> @@ -944,9 +944,9 @@ for opt do
> ;;
> --with-trace-file=*) trace_file="$optarg"
> ;;
> - --with-default-devices) default_devices="yes"
> + --with-default-devices) default_devices="true"
> ;;
> - --without-default-devices) default_devices="no"
> + --without-default-devices) default_devices="false"
> ;;
> --without-default-features) # processed above
> ;;
> @@ -5541,11 +5541,6 @@ echo "GIT_UPDATE=$git_update" >> $config_host_mak
>
> echo "ARCH=$ARCH" >> $config_host_mak
>
> -if test "$default_devices" = "yes" ; then
> - echo "CONFIG_MINIKCONF_MODE=--defconfig" >> $config_host_mak
> -else
> - echo "CONFIG_MINIKCONF_MODE=--allnoconfig" >> $config_host_mak
> -fi
> if test "$debug_tcg" = "yes" ; then
> echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak
> fi
> @@ -6498,7 +6493,7 @@ NINJA=$ninja $meson setup \
> -Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses
> -Dlibudev=$libudev\
> -Dlibssh=$libssh -Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy
> -Dlzfse=$lzfse \
> -Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng
> \
> - -Dattr=$attr \
> + -Dattr=$attr -Ddefault_devices=$default_devices \
> -Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \
> -Dvhost_user_blk_server=$vhost_user_blk_server \
> -Dfuse=$fuse -Dfuse_lseek=$fuse_lseek \
> diff --git a/meson.build b/meson.build
> index 341eadaa5c..4d331405e4 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1276,7 +1276,8 @@ foreach target : target_dirs
> output: config_devices_mak,
> depfile: config_devices_mak + '.d',
> capture: true,
> - command: [minikconf, config_host['CONFIG_MINIKCONF_MODE'],
> + command: [minikconf,
> + get_option('default_devices') ? '--defconfig' :
> '--allnoconfig',
> config_devices_mak, '@DEPFILE@', '@INPUT@',
> host_kconfig, accel_kconfig])
>
> @@ -2469,7 +2470,7 @@ summary_info += {'capstone': capstone_opt
> == 'disabled' ? false : capst
> 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 += {'default devices':
> config_host['CONFIG_MINIKCONF_MODE'] == '--defconfig'}
> +summary_info += {'default devices': get_option('default_devices')}
> summary_info += {'plugin support':
> config_host.has_key('CONFIG_PLUGIN')}
> summary_info += {'fuzzing support': config_host.has_key('CONFIG_FUZZ')}
> if config_host.has_key('HAVE_GDB_BIN')
> diff --git a/meson_options.txt b/meson_options.txt
> index 8fcec056cd..1d4a71772e 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -7,6 +7,8 @@ option('qemu_firmwarepath', type : 'string', value : '',
> option('sphinx_build', type : 'string', value : '',
> description: 'Use specified sphinx-build [$sphinx_build] for
> building document (default to be empty)')
>
> +option('default_devices', type : 'boolean', value : true,
> + description: 'Include a default selection of devices in emulators')
> option('docs', type : 'feature', value : 'auto',
> description: 'Documentations build support')
> option('gettext', type : 'feature', value : 'auto',
> --
> 2.29.2
>
>
