From patchwork Mon May 7 17:34:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 157361 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EE2CBB6FA5 for ; Tue, 8 May 2012 03:35:21 +1000 (EST) Received: from localhost ([::1]:34685 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRRqB-0001Eu-Og for incoming@patchwork.ozlabs.org; Mon, 07 May 2012 13:35:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRRpx-00011r-7h for qemu-devel@nongnu.org; Mon, 07 May 2012 13:35:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SRRpv-0000y9-0Q for qemu-devel@nongnu.org; Mon, 07 May 2012 13:35:04 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:52055) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRRpu-0000QL-O9 for qemu-devel@nongnu.org; Mon, 07 May 2012 13:35:02 -0400 Received: by mail-pz0-f45.google.com with SMTP id v2so1242703dad.4 for ; Mon, 07 May 2012 10:35:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=HZMcNt8TEI+8Vbn90H8HJ2MTlDB5KJLRzpu5lrCbUEE=; b=l5WLeo8ZbZg1qXJl2YaLJpcF0eAkd996Du5nW+xoLal/zuTt1SUgQ3w0PO7CZwL3Y3 hDwRQuQIW62yHZH2yAt11T/3BJOGJdUjj4zS0jqnhUsmuM2OodkL0TClcLGcV2Opt276 dqx5flb/KWbybMLJCDLfgWSLs9ZJD/Ur6tNTezpbNdULGBVbaAx7ZXO8sxahRDPA9edj BNDq5wb8n7wGROq6l0GnhTCyJ4K9+NyCEJZTGvyEbQD7BtwzTGfdZkh/3W/QYHjBVv7/ ZHc9hBrsv2f7/sQKf5idT2hoRwkhk1ImUvz0zzzY8212etN22TFi8hfzEpstSsmnljFP w1BA== Received: by 10.68.191.74 with SMTP id gw10mr1876894pbc.90.1336412101849; Mon, 07 May 2012 10:35:01 -0700 (PDT) Received: from localhost.localdomain ([124.207.163.4]) by mx.google.com with ESMTPS id pn10sm18904952pbb.22.2012.05.07.10.34.57 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 07 May 2012 10:35:00 -0700 (PDT) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Tue, 8 May 2012 01:34:17 +0800 Message-Id: <1336412058-13751-2-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1336412058-13751-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1336412058-13751-1-git-send-email-wdongxu@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.45 Cc: Kevin Wolf , Dong Xu Wang , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 2/3 v9] qemu-iotests: support add-cow file format 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 Add qemu-iotests test cases for add-cow file format. CC: Kevin Wolf CC: Stefan Hajnoczi Signed-off-by: Dong Xu Wang --- tests/qemu-iotests/017 | 2 +- tests/qemu-iotests/018 | 2 +- tests/qemu-iotests/019 | 2 +- tests/qemu-iotests/020 | 2 +- tests/qemu-iotests/check | 4 ++-- tests/qemu-iotests/common | 6 ++++++ tests/qemu-iotests/common.rc | 19 +++++++++++++++++++ 7 files changed, 31 insertions(+), 6 deletions(-) diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 index 66951eb..d31432f 100755 --- a/tests/qemu-iotests/017 +++ b/tests/qemu-iotests/017 @@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.pattern # Any format supporting backing files -_supported_fmt qcow qcow2 vmdk qed +_supported_fmt qcow qcow2 vmdk qed add-cow _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018 index bd2db78..aa7444f 100755 --- a/tests/qemu-iotests/018 +++ b/tests/qemu-iotests/018 @@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.pattern # Any format supporting backing files -_supported_fmt qcow qcow2 vmdk qed +_supported_fmt qcow qcow2 vmdk qed add-cow _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019 index 8872b30..d938aca 100755 --- a/tests/qemu-iotests/019 +++ b/tests/qemu-iotests/019 @@ -44,7 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.pattern # Any format supporting backing files -_supported_fmt qcow qcow2 vmdk qed +_supported_fmt qcow qcow2 vmdk qed add-cow _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020 index 2fb0ff8..3dbb495 100755 --- a/tests/qemu-iotests/020 +++ b/tests/qemu-iotests/020 @@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.pattern # Any format supporting backing files -_supported_fmt qcow qcow2 vmdk qed +_supported_fmt qcow qcow2 vmdk qed add-cow _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 432732c..8061059 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -243,7 +243,7 @@ do echo " - no qualified output" err=true else - if diff -w $seq.out $tmp.out >/dev/null 2>&1 + if diff -w -I "^Formatting" $seq.out $tmp.out >/dev/null 2>&1 then echo "" if $err @@ -255,7 +255,7 @@ do else echo " - output mismatch (see $seq.out.bad)" mv $tmp.out $seq.out.bad - $diff -w $seq.out $seq.out.bad + $diff -w -I "^Formatting" $seq.out $seq.out.bad err=true fi fi diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common index eeb70cb..c80d18c 100644 --- a/tests/qemu-iotests/common +++ b/tests/qemu-iotests/common @@ -127,6 +127,7 @@ common options check options -raw test raw (default) -cow test cow + -add-cow test add-cow -qcow test qcow -qcow2 test qcow2 -qed test qed @@ -162,6 +163,11 @@ testlist options xpand=false ;; + -add-cow) + IMGFMT=add-cow + xpand=false + ;; + -qcow) IMGFMT=qcow xpand=false diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index e535874..93595c3 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -87,6 +87,18 @@ _make_test_img() fi if [ \( "$IMGFMT" = "qcow2" -o "$IMGFMT" = "qed" \) -a -n "$CLUSTER_SIZE" ]; then optstr=$(_optstr_add "$optstr" "cluster_size=$CLUSTER_SIZE") + elif [ "$IMGFMT" = "add-cow" ]; then + local BACKING="$TEST_IMG"".qcow2" + local IMG="$TEST_IMG"".raw" + if [ "$1" = "-b" ]; then + IMG="$IMG"".b" + $QEMU_IMG create -f raw $IMG $image_size>/dev/null + extra_img_options="-o image_file=$IMG $extra_img_options" + else + $QEMU_IMG create -f raw $IMG $image_size>/dev/null + $QEMU_IMG create -f qcow2 $BACKING $image_size>/dev/null + extra_img_options="-o backing_file=$BACKING,image_file=$IMG" + fi fi if [ -n "$optstr" ]; then @@ -114,6 +126,13 @@ _cleanup_test_img() rm -f $TEST_DIR/t.$IMGFMT rm -f $TEST_DIR/t.$IMGFMT.orig rm -f $TEST_DIR/t.$IMGFMT.base + if [ "$IMGFMT" = "add-cow" ]; then + rm -f $TEST_DIR/t.$IMGFMT.qcow2 + rm -f $TEST_DIR/t.$IMGFMT.raw + rm -f $TEST_DIR/t.$IMGFMT.raw.b + rm -f $TEST_DIR/t.$IMGFMT.ct.qcow2 + rm -f $TEST_DIR/t.$IMGFMT.ct.raw + fi ;; rbd)