On 23/12/2019 09.39, Paolo Bonzini wrote:
> On 23/12/19 08:43, Vladimir Sementsov-Ogievskiy wrote:
>> diff --git a/vl.c b/vl.c
>> index 86474a55c9..9fb859969c 100644
>> --- a/vl.c
>> +++ b/vl.c
>> @@ -2779,7 +2779,7 @@ static void configure_accelerators(const char
>> *progname)
>> for (tmp = accel_list; !accel_initialised && tmp && *tmp; tmp++) {
>> /*
>> * Filter invalid accelerators here, to prevent obscenities
>> - * such as "-machine accel=tcg,,thread=single".
>> + * such as "-machine accel=tcg,thread=single".
>
> The double comma is intentional. Without the "if" below, the comma
> would be escaped and parsed as "-accel tcg,thread=single".
>
>> */
>> if (accel_find(*tmp)) {
>> qemu_opts_parse_noisily(qemu_find_opts("accel"), *tmp,
>> true);
>> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
>> index 90970b0549..2890785a10 100755
>> --- a/tests/qemu-iotests/check
>> +++ b/tests/qemu-iotests/check
>> @@ -587,13 +587,13 @@ export QEMU_PROG="$(type -p "$QEMU_PROG")"
>>
>> case "$QEMU_PROG" in
>> *qemu-system-arm|*qemu-system-aarch64)
>> - export QEMU_OPTIONS="-nodefaults -display none -machine
>> virt,accel=qtest"
>> + export QEMU_OPTIONS="-nodefaults -display none -machine virt -accel
>> qtest"
>> ;;
>> *qemu-system-tricore)
>> - export QEMU_OPTIONS="-nodefaults -display none -machine
>> tricore_testboard,accel=qtest"
>> + export QEMU_OPTIONS="-nodefaults -display none -machine
>> tricore_testboard -accel qtest"
>> ;;
>> *)
>> - export QEMU_OPTIONS="-nodefaults -display none -machine accel=qtest"
>> + export QEMU_OPTIONS="-nodefaults -display none -accel qtest"
>> ;;
>> esac
>>
>>
>
> This part is good, but what is the reproducer?
Make the iotests run with either qemu-system-arm, qemu-system-aarch64 or
qemu-system-tricore, e.g.:
QEMU_PROG=aarch64-softmmu/qemu-system-aarch64 make check-block
HTH,
Thomas
