From patchwork Thu Jun 17 19:15:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brunner X-Patchwork-Id: 56084 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3C65AB7D8B for ; Fri, 18 Jun 2010 05:17:17 +1000 (EST) Received: from localhost ([127.0.0.1]:44760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OPKaQ-0000i5-AH for incoming@patchwork.ozlabs.org; Thu, 17 Jun 2010 15:17:14 -0400 Received: from [140.186.70.92] (port=55655 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OPKYU-000807-1E for qemu-devel@nongnu.org; Thu, 17 Jun 2010 15:15:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OPKYS-0005fo-KL for qemu-devel@nongnu.org; Thu, 17 Jun 2010 15:15:13 -0400 Received: from fg-out-1718.google.com ([72.14.220.153]:13665) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OPKYS-0005fV-Ft for qemu-devel@nongnu.org; Thu, 17 Jun 2010 15:15:12 -0400 Received: by fg-out-1718.google.com with SMTP id 22so115121fge.10 for ; Thu, 17 Jun 2010 12:15:11 -0700 (PDT) Received: by 10.87.1.7 with SMTP id d7mr70123fgi.75.1276802110896; Thu, 17 Jun 2010 12:15:10 -0700 (PDT) Received: from chb-desktop (e181020234.adsl.alicedsl.de [85.181.20.234]) by mx.google.com with ESMTPS id 3sm15655395fge.15.2010.06.17.12.15.09 (version=SSLv3 cipher=RC4-MD5); Thu, 17 Jun 2010 12:15:10 -0700 (PDT) Date: Thu, 17 Jun 2010 21:15:08 +0200 From: Christian Brunner To: Kevin Wolf Message-ID: <20100617191508.GA1591@chb-desktop> References: <1275933621-404-1-git-send-email-morita.kazutaka@lab.ntt.co.jp> <4C123BAC.9080008@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4C123BAC.9080008@redhat.com> User-Agent: Mutt/1.5.20 (2009-06-14) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: aliguori@us.ibm.com, sheepdog@lists.wpkg.org, chris.krumme@windriver.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, MORITA Kazutaka Subject: [Qemu-devel] Re: [PATCH v5] block: add sheepdog driver for distributed storage support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On Fri, Jun 11, 2010 at 03:35:40PM +0200, Kevin Wolf wrote: > Am 07.06.2010 20:00, schrieb MORITA Kazutaka: > > Also, I'd like to have qemu-iotests run on it before including it. IIRC, > Christian has hacked on qemu-iotests to make it work with protocols for > his rbd driver - Christian, can you provide us with your changes, so > that they can be used for Sheepdog, too? Or if they are not too hacky, > maybe you can even post them for inclusion in qemu-iotests? > Attached is a patch to make qemu-iotests work with the rbd driver. However this is only a very basic hack for the rbd driver and not a generic patch for protocol support. If you want, I can try to make it a bit more versatile. hristian From 17031ac88d05b4796dc1f231317d843f26f1a331 Mon Sep 17 00:00:00 2001 From: Christian Brunner Date: Thu, 3 Jun 2010 21:05:24 +0200 Subject: [PATCH] a small hack to run tests aginst the rbd driver --- common | 6 ++++++ common.rc | 14 +++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/common b/common index 988fd5e..df4e6c9 100644 --- a/common +++ b/common @@ -122,6 +122,7 @@ check options -vdi test vdi -vpc test vpc -vmdk test vmdk + -rbd test rbd -xdiff graphical mode diff -nocache use O_DIRECT on backing file -misalign misalign memory allocations @@ -173,6 +174,11 @@ testlist options xpand=false ;; + -rbd) + IMGFMT=rbd + xpand=false + ;; + -nocache) QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --nocache" xpand=false diff --git a/common.rc b/common.rc index da58f92..2bde819 100644 --- a/common.rc +++ b/common.rc @@ -47,6 +47,10 @@ fi # make sure we have a standard umask umask 022 +if [ "$IMGFMT" = "rbd" ]; then + TEST_DIR=rbd:rbd +fi + TEST_IMG=$TEST_DIR/t.$IMGFMT _make_test_img() @@ -71,9 +75,13 @@ _make_test_img() _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" = "rbd" ]; then + rbdtool --delete t.$IMGFMT + else + rm -f $TEST_DIR/t.$IMGFMT + rm -f $TEST_DIR/t.$IMGFMT.orig + rm -f $TEST_DIR/t.$IMGFMT.base + fi } _check_test_img() -- 1.7.0.4