From patchwork Wed Mar 26 12:05:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 333833 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AFDD914008C for ; Wed, 26 Mar 2014 23:07:14 +1100 (EST) Received: from localhost ([::1]:47362 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSmbw-0000WT-83 for incoming@patchwork.ozlabs.org; Wed, 26 Mar 2014 08:07:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSmbA-0000Ml-De for qemu-devel@nongnu.org; Wed, 26 Mar 2014 08:06:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSmb4-0003pc-1p for qemu-devel@nongnu.org; Wed, 26 Mar 2014 08:06:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23693) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSmb3-0003pT-QL; Wed, 26 Mar 2014 08:06:17 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2QC6FPZ021755 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 26 Mar 2014 08:06:16 -0400 Received: from localhost (dhcp-64-106.muc.redhat.com [10.32.64.106]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s2QC6EIa030226; Wed, 26 Mar 2014 08:06:15 -0400 From: Stefan Hajnoczi To: Date: Wed, 26 Mar 2014 13:05:23 +0100 Message-Id: <1395835569-21193-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1395835569-21193-1-git-send-email-stefanha@redhat.com> References: <1395835569-21193-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , pmatouse@redhat.com, qemu-stable@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH for-2.0 01/47] qemu-iotests: add ./check -cloop support 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 the cloop block driver to qemu-iotests. Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- tests/qemu-iotests/common | 7 +++++++ tests/qemu-iotests/common.rc | 3 +++ 2 files changed, 10 insertions(+) diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common index 5795358..37e3bed 100644 --- a/tests/qemu-iotests/common +++ b/tests/qemu-iotests/common @@ -137,6 +137,7 @@ common options check options -raw test raw (default) -cow test cow + -cloop test cloop -qcow test qcow -qcow2 test qcow2 -qed test qed @@ -178,6 +179,12 @@ testlist options xpand=false ;; + -cloop) + IMGFMT=cloop + IMGFMT_GENERIC=false + xpand=false + ;; + -qcow) IMGFMT=qcow xpand=false diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 881079b..7f00883 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -364,6 +364,9 @@ _fail() # _supported_fmt() { + # "generic" is suitable for most image formats. For some formats it doesn't + # work, however (most notably read-only formats), so they can opt out by + # setting IMGFMT_GENERIC to false. for f; do if [ "$f" = "$IMGFMT" -o "$f" = "generic" -a "$IMGFMT_GENERIC" = "true" ]; then return