Re: [PATCH 02/18] iotests: Replace IMGOPTS by _unsupported_imgopts

[Max Reitz]

On 30.09.19 16:47, Maxim Levitsky wrote:
> On Mon, 2019-09-30 at 14:59 +0200, Max Reitz wrote:
>> On 29.09.19 18:31, Maxim Levitsky wrote:
>>> On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
>>>> Some tests require compat=1.1 and thus set IMGOPTS='compat=1.1'
>>>> globally.  That is not how it should be done; instead, they should
>>>> simply set _unsupported_imgopts to compat=0.10 (compat=1.1 is the
>>>> default anyway).
>>>>
>>>> This makes the tests heed user-specified $IMGOPTS.  Some do not work
>>>> with all image options, though, so we need to disable them accordingly.
>>>>
>>>> Signed-off-by: Max Reitz <address@hidden>
>>>> ---
>>>>  tests/qemu-iotests/036 | 3 +--
>>>>  tests/qemu-iotests/060 | 4 ++--
>>>>  tests/qemu-iotests/062 | 3 ++-
>>>>  tests/qemu-iotests/066 | 3 ++-
>>>>  tests/qemu-iotests/068 | 3 ++-
>>>>  tests/qemu-iotests/098 | 3 +--
>>>>  6 files changed, 10 insertions(+), 9 deletions(-)

[...]

>>
>>>> +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
>>>>  
>>>> -IMGOPTS="compat=1.1"
>>>>  IMG_SIZE=128K
>>>>  
>>>>  case "$QEMU_DEFAULT_MACHINE" in
>>>> diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
>>>> index 1c1d1c468f..2d68dc7d6c 100755
>>>> --- a/tests/qemu-iotests/098
>>>> +++ b/tests/qemu-iotests/098
>>>> @@ -40,8 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>>>>  
>>>>  _supported_fmt qcow2
>>>>  _supported_proto file
>>>> -
>>>> -IMGOPTS="compat=1.1"
>>>> +_unsupported_imgopts 'compat=0.10'
>>>
>>> Any idea why? I am not familiar with qcow2 well enought to
>>> know but this misses a comment with justification.
>>
>> Because the special bdrv_make_empty() version we want to test only works
>> with qcow2 v3 images.
> Just to understand this, we have
> 
> compat=0.10, also known as v2, which is the classical qcow2 (and v1 is 
> basically qcow)
> and then we have compat=1.1 which is also known as v3, and once upon a time 
> was supposed
> to be called qcow3, but at the end remained qcow2.

Yep, that’s correct.  If you want to, you can still call it qcow3.  I
wanted to do that at some point, but it turned out that nobody else does it.

Max

signature.asc
Description: OpenPGP digital signature