Re: [PATCH v4 03/19] Revert "tests/tcg/meson.build: implement ./configure containers options"

["Alex Bennée" <alex.bennee@linaro.org>]

Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> writes:

> On 9/16/2026 8:29 AM, Alex Bennée wrote:
>> We want to keep the container configuration inside configure for the
>> firmware builds.
>> 
>> This partially reverts commit 522b299ca4316d8cad57f9496ffcba87dcc20719
>> while keeping the plumbing to disable containers within meson.
>> 
>> Tested-by: Eric Farman <farman@linux.ibm.com>
>> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
>> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
>> [AJB: untangle changes since]
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> Tested-by: Jared Rossi <jrossi@linux.ibm.com>
>> 
>> ---
>> v4
>>   - tweak revert to keep disable reported
>>   - update commit msg
>> ---
>>  configure             | 14 ++++++++++----
>>  meson_options.txt     |  3 +++
>>  tests/tcg/meson.build |  3 +++
>>  3 files changed, 16 insertions(+), 4 deletions(-)
>> 
>> diff --git a/configure b/configure
>> index bedde58b8cf..6084a7a065e 100755
>> --- a/configure
>> +++ b/configure
>> @@ -260,7 +260,7 @@ ninja=""
>>  python=
>>  download="enabled"
>>  skip_meson=no
>> -use_containers=""
>> +use_containers="yes"
>>  rust="disabled"
>>  rust_target_triple=""
>>  
>> @@ -727,11 +727,14 @@ for opt do
>>    ;;
>>    --disable-plugins) plugins="no"
>>    ;;
>> -  --enable-containers) # enabled by default
>> +  --enable-containers) use_containers="yes"
>> +                       meson_option_add -Dcontainers=true
>>    ;;
>> -  --disable-containers) meson_option_add -Dcontainers=false
>> +  --disable-containers) use_containers="no"
>> +                        meson_option_add -Dcontainers=false
>>    ;;
>> -  --container-command=*) meson_option_add -Dcontainer_command="$optarg"
>> +  --container-command=*) container_command="$optarg"
>> +                         meson_option_add -Dcontainer_command="$optarg"
>
> Not sure if we want to keep this option (meson container_command).
> Related if in tests/tcg/meson.build can be removed also.

We want Makefile.include and meson to use the same container runtime
surely?

>
>>    ;;
>>    --rust-target-triple=*) rust_target_triple="$optarg"
>>    ;;
>> @@ -1718,6 +1721,9 @@ echo all: >> $config_host_mak
>>  
>>  echo "SRC_PATH=$source_path" >> $config_host_mak
>>  echo "TARGET_DIRS=$target_list" >> $config_host_mak
>> +if test "$container_command" != ""; then
>> +    echo "CONTAINER_COMMAND=$container_command" >> $config_host_mak
>> +fi
>>  echo "SUBDIRS=$subdirs" >> $config_host_mak
>>  echo "PYTHON=$python" >> $config_host_mak
>>  echo "MKVENV_ENSUREGROUP=$mkvenv ensuregroup $mkvenv_online_flag" >> $config_host_mak
>> diff --git a/meson_options.txt b/meson_options.txt
>> index 66d3689d14c..daf301ed48a 100644
>> --- a/meson_options.txt
>> +++ b/meson_options.txt
>> @@ -389,6 +389,9 @@ option('rust', type: 'feature', value: 'disabled',
>>         description: 'Rust support')
>>  option('strict_rust_lints', type: 'boolean', value: false,
>>         description: 'Enable stricter set of Rust warnings')
>> +option('container_registry', type: 'string',
>> +       value: 'registry.gitlab.com/qemu-project/qemu',
>> +       description: 'container registry to cache from')
>>  option('containers', type: 'boolean', value: true,
>>         description: 'use containers to cross compile tcg tests')
>>  option('container_command', type: 'string',
>> diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build
>> index ce208e686ff..890da7b81e9 100644
>> --- a/tests/tcg/meson.build
>> +++ b/tests/tcg/meson.build
>> @@ -101,6 +101,9 @@ if get_option('containers')
>>    endif
>>  endif
>>  tcg_tests_summary += {'container command': container_command}
>> +if get_option('container_registry') != ''
>> +  tcg_tests_summary += {'container registry': get_option('container_registry')}
>> +endif
>> 
>
> Rebase issue?

Possibly - it got messy with the reverts.

>
>>  # plugins come first, as we need to build the list
>>  test_plugins = {}

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro