From patchwork Wed Apr 3 22:17:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Richard W.M. Jones" X-Patchwork-Id: 233593 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 BF39E2C012B for ; Thu, 4 Apr 2013 09:20:45 +1100 (EST) Received: from localhost ([::1]:43865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNW2t-0002Ur-Tl for incoming@patchwork.ozlabs.org; Wed, 03 Apr 2013 18:20:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNW0E-0007sm-Ne for qemu-devel@nongnu.org; Wed, 03 Apr 2013 18:18:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNW0D-0007F2-Nf for qemu-devel@nongnu.org; Wed, 03 Apr 2013 18:17:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38799) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNW0D-0007Ev-G6 for qemu-devel@nongnu.org; Wed, 03 Apr 2013 18:17:57 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r33MHuqP020548 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 3 Apr 2013 18:17:57 -0400 Received: from choo.home.annexia.org (vpn1-7-22.ams2.redhat.com [10.36.7.22]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r33MHph2029097 for ; Wed, 3 Apr 2013 18:17:56 -0400 From: "Richard W.M. Jones" To: qemu-devel@nongnu.org Date: Wed, 3 Apr 2013 23:17:41 +0100 Message-Id: <1365027461-8884-4-git-send-email-rjones@redhat.com> In-Reply-To: <1365027461-8884-1-git-send-email-rjones@redhat.com> References: <1365027461-8884-1-git-send-email-rjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v5 3/3] iotests: Add 'check -ssh' option to test Secure Shell block device. 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 From: "Richard W.M. Jones" Signed-off-by: Richard W.M. Jones --- tests/qemu-iotests/common | 5 +++++ tests/qemu-iotests/common.rc | 3 +++ 2 files changed, 8 insertions(+) diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common index b3aad89..6826ea7 100644 --- a/tests/qemu-iotests/common +++ b/tests/qemu-iotests/common @@ -137,6 +137,7 @@ check options -rbd test rbd -sheepdog test sheepdog -nbd test nbd + -ssh test ssh -xdiff graphical mode diff -nocache use O_DIRECT on backing file -misalign misalign memory allocations @@ -206,6 +207,10 @@ testlist options IMGPROTO=nbd xpand=false ;; + -ssh) + IMGPROTO=ssh + xpand=false + ;; -nocache) QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --nocache" xpand=false diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index e522d61..a536bf7 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -52,6 +52,9 @@ if [ "$IMGPROTO" = "file" ]; then elif [ "$IMGPROTO" = "nbd" ]; then TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT TEST_IMG="nbd:127.0.0.1:10810" +elif [ "$IMGPROTO" = "ssh" ]; then + TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT + TEST_IMG="ssh://127.0.0.1$TEST_IMG_FILE" else TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT fi