From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yl6XR-0002QW-AS for qemu-devel@nongnu.org; Wed, 22 Apr 2015 22:06:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yl6XN-0007z3-68 for qemu-devel@nongnu.org; Wed, 22 Apr 2015 22:06:49 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:44519) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yl6XM-0007ye-A7 for qemu-devel@nongnu.org; Wed, 22 Apr 2015 22:06:45 -0400 Received: from /spool/local by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 23 Apr 2015 12:06:42 +1000 Received: from d23relay07.au.ibm.com (d23relay07.au.ibm.com [9.190.26.37]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id F2F7A2BB0040 for ; Thu, 23 Apr 2015 12:06:38 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay07.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t3N26U4x58064982 for ; Thu, 23 Apr 2015 12:06:38 +1000 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t3N265Gl021363 for ; Thu, 23 Apr 2015 12:06:05 +1000 From: Bo Tu Date: Thu, 23 Apr 2015 10:05:27 +0800 Message-Id: <1429754727-11263-8-git-send-email-tubo@linux.vnet.ibm.com> In-Reply-To: <1429754727-11263-1-git-send-email-tubo@linux.vnet.ibm.com> References: <1429754727-11263-1-git-send-email-tubo@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH RFC v7 7/7] qemu-iotests-s390x-fix-test-130 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, armbru@redhat.com, mimu@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 --- 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) ccocomcommcommicommitcommit commit icommit idcommit idecommit ide0commit ide0-commit ide0-hcommit ide0-hdcommit ide0-hd0 +(qemu) ccocomcommcommicommitcommit commit vcommit vicommit vircommit virtcommit virticommit virtiocommit virtio0 (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 vcommit vicommit vircommit virtcommit virticommit virtiocommit virtio0 (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) ccocomcommcommicommitcommit commit icommit idcommit idecommit ide0commit ide0-commit ide0-hcommit ide0-hdcommit ide0-hd0 +(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) +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