]> git.ipfire.org Git - thirdparty/qemu.git/commit
iotests: fix default machine type detection
authorAndrey Drobyshev <andrey.drobyshev@virtuozzo.com>
Wed, 22 Nov 2023 12:15:38 +0000 (14:15 +0200)
committerKevin Wolf <kwolf@redhat.com>
Tue, 28 Nov 2023 13:56:32 +0000 (14:56 +0100)
commit3b7094fe8329c5c7bb0d685e1876aa30f59bece6
treecdb0ea2d4fc8c01be5f0fb3f5b12eaaff7fdc1e6
parente867b01cd6658a64c16052117dbb18093a2f9772
iotests: fix default machine type detection

The machine type is being detected based on "-M help" output, and we're
searching for the line ending with " (default)".  However, in downstream
one of the machine types s marked as deprecated might become the
default, in which case this logic breaks as the line would now end with
" (default) (deprecated)".  To fix potential issues here, let's relax
that requirement and detect the mere presence of " (default)" line
instead.

Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
Message-ID: <20231122121538.32903-1-andrey.drobyshev@virtuozzo.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
tests/qemu-iotests/testenv.py