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.
Signed-off-by: Bo Tu
---
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)
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 t[K[D[D[D[D[D[D[D[Dcommit
te[K[D[D[D[D[D[D[D[D[Dcommit
tes[K[D[D[D[D[D[D[D[D[D[Dcommit
test[K[D[D[D[D[D[D[D[D[D[D[Dcommit
testd[K[D[D[D[D[D[D[D[D[D[D[D[Dcommit
testdi[K[D[D[D[D[D[D[D[D[D[D[D[D[Dcommit
testdis[K[D[D[D[D[D[D[D[D[D[D[D[D[D[Dcommit testdisk[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 t[K[D[D[D[D[D[D[D[Dcommit
te[K[D[D[D[D[D[D[D[D[Dcommit
tes[K[D[D[D[D[D[D[D[D[D[Dcommit
test[K[D[D[D[D[D[D[D[D[D[D[Dcommit
testd[K[D[D[D[D[D[D[D[D[D[D[D[Dcommit
testdi[K[D[D[D[D[D[D[D[D[D[D[D[D[Dcommit
testdis[K[D[D[D[D[D[D[D[D[D[D[D[D[D[Dcommit testdisk[K
(qemu)
image: TEST_DIR/t.IMGFMT
file format: IMGFMT
--
2.3.0