[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC v7 7/7] qemu-iotests-s390x-fix-test-130
From: |
Xiao Guang Chen |
Subject: |
[Qemu-devel] [PATCH RFC v7 7/7] qemu-iotests-s390x-fix-test-130 |
Date: |
Thu, 23 Apr 2015 10:42:18 +0800 |
From: Bo Tu <address@hidden>
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 <address@hidden>
---
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"
+ ;;
+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)"
_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
--
2.3.0
- [Qemu-devel] [PATCH RFC v7 0/7] Update tests/qemu-iotests failing cases for the s390 platform, Xiao Guang Chen, 2015/04/22
- [Qemu-devel] [PATCH RFC v7 1/7] qemu-iotests: qemu machine type support, Xiao Guang Chen, 2015/04/22
- [Qemu-devel] [PATCH RFC v7 3/7] qemu-iotests: s390x: fix test 041, Xiao Guang Chen, 2015/04/22
- [Qemu-devel] [PATCH RFC v7 2/7] qemu-iotests: run qemu with -nodefaults and fix 067, 071, 081 and 087, Xiao Guang Chen, 2015/04/22
- [Qemu-devel] [PATCH RFC v7 5/7] qemu-iotests: s390x: fix test 049, Xiao Guang Chen, 2015/04/22
- [Qemu-devel] [PATCH RFC v7 4/7] qemu-iotests: s390x: fix test 055, Xiao Guang Chen, 2015/04/22
- [Qemu-devel] [PATCH RFC v7 7/7] qemu-iotests-s390x-fix-test-130,
Xiao Guang Chen <=
- Re: [Qemu-devel] [PATCH RFC v7 7/7] qemu-iotests-s390x-fix-test-130, Max Reitz, 2015/04/23
- Re: [Qemu-devel] [PATCH RFC v7 7/7] qemu-iotests-s390x-fix-test-130, tu bo, 2015/04/27
- Re: [Qemu-devel] [PATCH RFC v7 7/7] qemu-iotests-s390x-fix-test-130, Max Reitz, 2015/04/27
- Re: [Qemu-devel] [PATCH RFC v7 7/7] qemu-iotests-s390x-fix-test-130, Kevin Wolf, 2015/04/27
- Re: [Qemu-devel] [PATCH RFC v7 7/7] qemu-iotests-s390x-fix-test-130, tu bo, 2015/04/27
- Re: [Qemu-devel] [PATCH RFC v7 7/7] qemu-iotests-s390x-fix-test-130, Kevin Wolf, 2015/04/28
[Qemu-devel] [PATCH RFC v7 6/7] qemu-iotests: s390x: fix test 051, Xiao Guang Chen, 2015/04/22