[v10,7/7] qemu-iotests: s390x: fix test 130

The default device id of hard disk on the s390 platform is "virtio0"
which differs to the "ide0-hd0" for the x86 platform. Setting id in
the drive definition, ie:"qemu -drive id=testdisk", will be the same
on all platforms.

Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Bo Tu <tubo@linux.vnet.ibm.com>
---
 tests/qemu-iotests/130     | 8 ++++----
 tests/qemu-iotests/130.out | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

I got one issue after running checkpatch.pl  below,

[gavin@oc6333346435 qemu]$ ./scripts/checkpatch.pl
home/gavin/patch/v8/0007-qemu-iotests-s390x-fix-test-130.patch //
ERROR: Invalid UTF-8, patch and commit message should be encoded in
UTF-8//
#52: FILE: tests/qemu-iotests/130.out:12://
+(qemu) commit testdisk//
          ^//

ERROR: Invalid UTF-8, patch and commit message should be encoded in
UTF-8//
#60: FILE: tests/qemu-iotests/130.out:19://
+(qemu) commit testdisk//
          ^//

total: 2 errors, 0 warnings, 36 lines checked/

The reason is that 130.out contains some non-text data.  Do I need to
report an issue to checkpatch.pl,  or ignore this error message? thanks

On 05/29/2015 11:32 AM, Bo Tu wrote:
> The default device id of hard disk on the s390 platform is "virtio0"
> which differs to the "ide0-hd0" for the x86 platform. Setting id in
> the drive definition, ie:"qemu -drive id=testdisk", will be the same
> on all platforms.
>
> Reviewed-by: Max Reitz <mreitz@redhat.com>
> Signed-off-by: Bo Tu <tubo@linux.vnet.ibm.com>
> ---
>   tests/qemu-iotests/130     | 8 ++++----
>   tests/qemu-iotests/130.out | 4 ++--
>   2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
> index bc26247..9209992 100755
> --- a/tests/qemu-iotests/130
> +++ b/tests/qemu-iotests/130
> @@ -59,8 +59,8 @@ echo
>   # bdrv_make_empty() involves a header update for qcow2
>
>   # 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)"
> +_launch_qemu -drive id=testdisk,file="$TEST_IMG",backing.file.filename="$TEST_IMG.base"
> +_send_qemu_cmd $QEMU_HANDLE "commit testdisk" "(qemu)"
>   _send_qemu_cmd $QEMU_HANDLE '' '(qemu)'
>   _cleanup_qemu
>   _img_info | _filter_img_info
> @@ -68,8 +68,8 @@ _img_info | _filter_img_info
>   # Make sure that if there was a backing file that was just overridden on the
>   # 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)"
> +_launch_qemu -drive id=testdisk,file="$TEST_IMG",backing.file.filename="$TEST_IMG.base",backing.driver=$IMGFMT
> +_send_qemu_cmd $QEMU_HANDLE "commit testdisk" "(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..9ec9d2a 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) ccocomcommcommicommitcommit commit icommit idcommit idecommit ide0commit ide0-commit ide0-hcommit ide0-hdcommit ide0-hd0
> +(qemu) ccocomcommcommicommitcommit commit tcommit tecommit tescommit testcommit testdcommit testdicommit testdiscommit testdisk
>   (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) ccocomcommcommicommitcommit commit icommit idcommit idecommit ide0commit ide0-commit ide0-hcommit ide0-hdcommit ide0-hd0
> +(qemu) ccocomcommcommicommitcommit commit tcommit tecommit tescommit testcommit testdcommit testdicommit testdiscommit testdisk
>   (qemu)
>   image: TEST_DIR/t.IMGFMT
>   file format: IMGFMT

On 02.07.2015 11:01, tu bo wrote:
> I got one issue after running checkpatch.pl  below,
>
> [gavin@oc6333346435 qemu]$ ./scripts/checkpatch.pl
> home/gavin/patch/v8/0007-qemu-iotests-s390x-fix-test-130.patch //
> ERROR: Invalid UTF-8, patch and commit message should be encoded in
> UTF-8//
> #52: FILE: tests/qemu-iotests/130.out:12://
> +(qemu) commit testdisk//
>           ^//
>
> ERROR: Invalid UTF-8, patch and commit message should be encoded in
> UTF-8//
> #60: FILE: tests/qemu-iotests/130.out:19://
> +(qemu) commit testdisk//
>           ^//
>
> total: 2 errors, 0 warnings, 36 lines checked/
>
> The reason is that 130.out contains some non-text data.  Do I need to
> report an issue to checkpatch.pl,  or ignore this error message? thanks

I think ignoring it is fine.

Max