Re: [Qemu-devel] [PATCH RFC v7 7/7] qemu-iotests-s390x-fix-test-130

[tu bo <tubo@linux.vnet.ibm.com>]

[-- Attachment #1: Type: text/plain, Size: 9126 bytes --]

Hi Max:

On 04/24/2015 01:07 AM, Max Reitz wrote:
> Well, that's a peculiar commit title. :-)
>
> I guess it's supposed to be "qemu-iotests: s390x: fix test 130"?
You're right. I will change it in the next version :-)
>
> On 23.04.2015 04:42, Xiao Guang Chen wrote:
>> From: Bo Tu <tubo@linux.vnet.ibm.com>
>>
>> The tests for device type "ide_cd" should only be tested for the pc 
>> platform.
>> The default device id of hard disk on the s390 platform differs to that
>> of the x86 platform. A new variable device_id is defined and "virtio0"
>> set for the s390 platform. A x86 platform specific output file is also
>> needed.
>>
>> Signed-off-by: Bo Tu <tubo@linux.vnet.ibm.com>
>> ---
>>   tests/qemu-iotests/130        | 13 +++++++++++--
>>   tests/qemu-iotests/130.out    |  4 ++--
>>   tests/qemu-iotests/130.pc.out | 43 
>> +++++++++++++++++++++++++++++++++++++++++++
>>   3 files changed, 56 insertions(+), 4 deletions(-)
>>   create mode 100644 tests/qemu-iotests/130.pc.out
>>
>> diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
>> index bc26247..de40c7b 100755
>> --- a/tests/qemu-iotests/130
>> +++ b/tests/qemu-iotests/130
>> @@ -58,9 +58,18 @@ echo "=== HMP commit ==="
>>   echo
>>   # bdrv_make_empty() involves a header update for qcow2
>>   +case "$QEMU_DEFAULT_MACHINE" in
>> +    pc)
>> +        device_id="ide0-hd0"
>> +        ;;
>> +    s390)
>> +        device_id="virtio0"
>> +        ;;
>
> I think I mentioned before that I don't really like not taking the 
> fact into account that there are other machine types, too. I'm still 
> accepting it based on the fact that I think those machine types won't 
> pass the tests right now anyway, so not caring for them in these case 
> blocks won't break any tests, but it still feels like something we can 
> avoid (like defaulting to virtio0 for any non-pc platform).
>
> Anyway, because I seem to remember I accepted it before:
>
> With the commit title fixed:
>
> Reviewed-by: Max Reitz <mreitz@redhat.com>
I guess you discussed with Xiao Guang Chen and accepted it in "[PATCH 
RFC v5 6/7] qemu-iotests s390x fix test-051",  because test 130 and 051 
are using the same fix solution, and test 051 was fixed in v5. Seeing 
section of v5 in cover letter as below:
/v5://
//1. Add a pc specific output file for test 051.//
//2. Add a filter to test case 051 to filter s390 specific warnings.//
//3. Check whether the machine type is pc or not rather than check 
whether the machine type //
//is s390.//
//4. When using a machine specific reference file if the default machine 
has an alias then//
//use the alias as the output file name otherwise use the default 
machine name as the output//
//file name/
>
>> +esac
>> +
>>   # Test that a backing file isn't written
>>   _launch_qemu -drive 
>> file="$TEST_IMG",backing.file.filename="$TEST_IMG.base"
>> -_send_qemu_cmd $QEMU_HANDLE "commit ide0-hd0" "(qemu)"
>> +_send_qemu_cmd $QEMU_HANDLE "commit " $device_id "(qemu)"
>
> ("commit $device_id" "(qemu)" would've worked, too, but it's fine the 
> way _send_qemu_cmd works)
>
>>   _send_qemu_cmd $QEMU_HANDLE '' '(qemu)'
>>   _cleanup_qemu
>>   _img_info | _filter_img_info
>> @@ -69,7 +78,7 @@ _img_info | _filter_img_info
>>   # command line, that backing file is retained, with the right format
>>   _make_test_img -F raw -b "$TEST_IMG.orig" 64M
>>   _launch_qemu -drive 
>> file="$TEST_IMG",backing.file.filename="$TEST_IMG.base",backing.driver=$IMGFMT
>> -_send_qemu_cmd $QEMU_HANDLE "commit ide0-hd0" "(qemu)"
>> +_send_qemu_cmd $QEMU_HANDLE "commit " $device_id "(qemu)"
>>   _send_qemu_cmd $QEMU_HANDLE '' '(qemu)'
>>   _cleanup_qemu
>>   _img_info | _filter_img_info
>> diff --git a/tests/qemu-iotests/130.out b/tests/qemu-iotests/130.out
>> index ea68b5d..cc4a15a 100644
>> --- a/tests/qemu-iotests/130.out
>> +++ b/tests/qemu-iotests/130.out
>> @@ -9,14 +9,14 @@ virtual size: 64M (67108864 bytes)
>>   === HMP commit ===
>>     QEMU X.Y.Z monitor - type 'help' for more information
>> -(qemu) 
>> c^[[K^[[Dco^[[K^[[D^[[Dcom^[[K^[[D^[[D^[[Dcomm^[[K^[[D^[[D^[[D^[[Dcommi^[[K^[[D^[[D^[[D^[[D^[[Dcommit^[[K^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> i^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> id^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ide^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ide0^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0-^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ide0-h^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0-hd^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ide0-hd0^[[K
>> +(qemu) 
>> c^[[K^[[Dco^[[K^[[D^[[Dcom^[[K^[[D^[[D^[[Dcomm^[[K^[[D^[[D^[[D^[[Dcommi^[[K^[[D^[[D^[[D^[[D^[[Dcommit^[[K^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> v^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> vi^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> vir^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> virt^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit virti^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> virtio^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit virtio0^[[K
>>   (qemu)
>>   image: TEST_DIR/t.IMGFMT
>>   file format: IMGFMT
>>   virtual size: 64M (67108864 bytes)
>>   Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 
>> backing_file='TEST_DIR/t.IMGFMT.orig' backing_fmt='raw'
>>   QEMU X.Y.Z monitor - type 'help' for more information
>> -(qemu) 
>> c^[[K^[[Dco^[[K^[[D^[[Dcom^[[K^[[D^[[D^[[Dcomm^[[K^[[D^[[D^[[D^[[Dcommi^[[K^[[D^[[D^[[D^[[D^[[Dcommit^[[K^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> i^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> id^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ide^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ide0^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0-^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ide0-h^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0-hd^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ide0-hd0^[[K
>> +(qemu) 
>> c^[[K^[[Dco^[[K^[[D^[[Dcom^[[K^[[D^[[D^[[Dcomm^[[K^[[D^[[D^[[D^[[Dcommi^[[K^[[D^[[D^[[D^[[D^[[Dcommit^[[K^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> v^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> vi^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> vir^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> virt^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit virti^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> virtio^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit virtio0^[[K
>>   (qemu)
>>   image: TEST_DIR/t.IMGFMT
>>   file format: IMGFMT
>> diff --git a/tests/qemu-iotests/130.pc.out 
>> b/tests/qemu-iotests/130.pc.out
>> new file mode 100644
>> index 0000000..ea68b5d
>> --- /dev/null
>> +++ b/tests/qemu-iotests/130.pc.out
>> @@ -0,0 +1,43 @@
>> +QA output created by 130
>> +Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=67108864
>> +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
>> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
>> +image: TEST_DIR/t.IMGFMT
>> +file format: IMGFMT
>> +virtual size: 64M (67108864 bytes)
>> +
>> +=== HMP commit ===
>> +
>> +QEMU X.Y.Z monitor - type 'help' for more information
>> +(qemu) 
>> c^[[K^[[Dco^[[K^[[D^[[Dcom^[[K^[[D^[[D^[[Dcomm^[[K^[[D^[[D^[[D^[[Dcommi^[[K^[[D^[[D^[[D^[[D^[[Dcommit^[[K^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> i^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> id^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ide^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ide0^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0-^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ide0-h^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0-hd^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ide0-hd0^[[K
>> +(qemu)
>> +image: TEST_DIR/t.IMGFMT
>> +file format: IMGFMT
>> +virtual size: 64M (67108864 bytes)
>> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 
>> backing_file='TEST_DIR/t.IMGFMT.orig' backing_fmt='raw'
>> +QEMU X.Y.Z monitor - type 'help' for more information
>> +(qemu) 
>> c^[[K^[[Dco^[[K^[[D^[[Dcom^[[K^[[D^[[D^[[Dcomm^[[K^[[D^[[D^[[D^[[Dcommi^[[K^[[D^[[D^[[D^[[D^[[Dcommit^[[K^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> i^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> id^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ide^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ide0^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0-^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ide0-h^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0-hd^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit 
>> ide0-hd0^[[K
>> +(qemu)
>> +image: TEST_DIR/t.IMGFMT
>> +file format: IMGFMT
>> +virtual size: 64M (67108864 bytes)
>> +backing file: TEST_DIR/t.IMGFMT.orig
>> +backing file format: raw
>> +
>> +=== Marking image dirty (lazy refcounts) ===
>> +
>> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
>> +wrote 4096/4096 bytes at offset 0
>> +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>> +image: TEST_DIR/t.IMGFMT
>> +file format: IMGFMT
>> +virtual size: 64M (67108864 bytes)
>> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 
>> backing_file='TEST_DIR/t.IMGFMT.orig' backing_fmt='raw'
>> +wrote 4096/4096 bytes at offset 0
>> +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>> +image: TEST_DIR/t.IMGFMT
>> +file format: IMGFMT
>> +virtual size: 64M (67108864 bytes)
>> +backing file: TEST_DIR/t.IMGFMT.orig
>> +backing file format: raw
>> +*** done
>
>


[-- Attachment #2: Type: text/html, Size: 12847 bytes --]