From patchwork Thu Sep 26 00:16:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 278046 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1FC4C2C0086 for ; Thu, 26 Sep 2013 10:18:39 +1000 (EST) Received: from localhost ([::1]:55496 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOzHw-0001bw-UB for incoming@patchwork.ozlabs.org; Wed, 25 Sep 2013 20:18:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOzFz-0007AG-I3 for qemu-devel@nongnu.org; Wed, 25 Sep 2013 20:16:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VOzFp-00022G-1w for qemu-devel@nongnu.org; Wed, 25 Sep 2013 20:16:35 -0400 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:35404) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOzFo-00021o-Es for qemu-devel@nongnu.org; Wed, 25 Sep 2013 20:16:25 -0400 Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 26 Sep 2013 05:46:22 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp01.in.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 26 Sep 2013 05:46:20 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 7E6B8E0053 for ; Thu, 26 Sep 2013 05:47:25 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r8Q0GIFA48496828 for ; Thu, 26 Sep 2013 05:46:18 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r8Q0GJH0028590 for ; Thu, 26 Sep 2013 05:46:20 +0530 Received: from RH64wenchao ([9.181.129.59]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r8Q0GAS6028311; Thu, 26 Sep 2013 05:46:19 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Thu, 26 Sep 2013 08:16:08 +0800 Message-Id: <1380154568-5339-8-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1380154568-5339-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1380154568-5339-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13092600-4790-0000-0000-00000A82FEB7 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.1 Cc: kwolf@redhat.com, pbonzini@redhat.com, Wenchao Xia , stefanha@gmail.com Subject: [Qemu-devel] [PATCH V3 7/7] qemu-iotests: add test for snapshot in qemu-img convert X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Wenchao Xia --- tests/qemu-iotests/058 | 19 ++++++++++++++++++- tests/qemu-iotests/058.out | 12 ++++++++++++ 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058 index a1e8d62..ec7e06d 100755 --- a/tests/qemu-iotests/058 +++ b/tests/qemu-iotests/058 @@ -1,6 +1,6 @@ #!/bin/bash # -# Test export internal snapshot by qemu-nbd. +# Test export internal snapshot by qemu-nbd, convert it by qemu-img. # # Copyright (C) 2013 IBM, Inc. # @@ -33,6 +33,8 @@ status=1 # failure is the default! nbd_snapshot_port=10850 nbd_snapshot_img="nbd:127.0.0.1:$nbd_snapshot_port" +converted_image=$TEST_IMG.converted + _export_nbd_snapshot() { eval "$QEMU_NBD -v -t -b 127.0.0.1 -p $nbd_snapshot_port $TEST_IMG -l $1 &" @@ -53,6 +55,7 @@ _cleanup() kill $NBD_SNAPSHOT_PID fi _cleanup_test_img + rm -f $converted_image } trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -98,6 +101,20 @@ echo "== verifying the exported snapshot with patterns ==" $QEMU_IO -c 'read -P 0xa 0x1000 0x1000' $nbd_snapshot_img | _filter_qemu_io $QEMU_IO -c 'read -P 0xb 0x2000 0x1000' $nbd_snapshot_img | _filter_qemu_io +$QEMU_IMG convert $TEST_IMG -s sn1 -O qcow2 $converted_image + +echo +echo "== verifying the converted snapshot with patterns ==" +$QEMU_IO -c 'read -P 0xa 0x1000 0x1000' $converted_image | _filter_qemu_io +$QEMU_IO -c 'read -P 0xb 0x2000 0x1000' $converted_image | _filter_qemu_io + +$QEMU_IMG convert $TEST_IMG -L snapshot.name=sn1 -O qcow2 $converted_image + +echo +echo "== verifying the converted snapshot with patterns ==" +$QEMU_IO -c 'read -P 0xa 0x1000 0x1000' $converted_image | _filter_qemu_io +$QEMU_IO -c 'read -P 0xb 0x2000 0x1000' $converted_image | _filter_qemu_io + # success, all done echo "*** done" rm -f $seq.full diff --git a/tests/qemu-iotests/058.out b/tests/qemu-iotests/058.out index cc4b8ca..a8381b9 100644 --- a/tests/qemu-iotests/058.out +++ b/tests/qemu-iotests/058.out @@ -29,4 +29,16 @@ read 4096/4096 bytes at offset 4096 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) read 4096/4096 bytes at offset 8192 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +== verifying the converted snapshot with patterns == +read 4096/4096 bytes at offset 4096 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 4096/4096 bytes at offset 8192 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +== verifying the converted snapshot with patterns == +read 4096/4096 bytes at offset 4096 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 4096/4096 bytes at offset 8192 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) *** done