Commit 137a905f authored by Bo Tu's avatar Bo Tu Committed by Kevin Wolf
Browse files

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: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarBo Tu <tubo@linux.vnet.ibm.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 21278992

tests/qemu-iotests/130

+4 −4
Original line number Diff line number Diff line
@@ -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

tests/qemu-iotests/130.out

+2 −2
Original line number Diff line number Diff line
@@ -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