From nobody Tue Feb 10 19:15:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1491277875820565.0742815192974; Mon, 3 Apr 2017 20:51:15 -0700 (PDT) Received: from localhost ([::1]:33814 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvFUw-0007BE-On for importer@patchew.org; Mon, 03 Apr 2017 23:51:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvFSm-0005lF-7I for qemu-devel@nongnu.org; Mon, 03 Apr 2017 23:49:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvFSl-0005vP-0o for qemu-devel@nongnu.org; Mon, 03 Apr 2017 23:49:00 -0400 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:35071) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cvFSk-0005u4-Qa for qemu-devel@nongnu.org; Mon, 03 Apr 2017 23:48:58 -0400 Received: by mail-pg0-x244.google.com with SMTP id g2so34086357pge.2 for ; Mon, 03 Apr 2017 20:48:58 -0700 (PDT) Received: from localhost.localdomain.localdomain ([172.56.38.27]) by smtp.gmail.com with ESMTPSA id u198sm28331074pgb.45.2017.04.03.20.48.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Apr 2017 20:48:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TSg3pgf8JD2QoGN6Z880SoCYOhUh6LCx4/UDO+cutRU=; b=uKsQm3SIrlJ1NFUhI+g8BfCmR1GONUtNdL/zE3VPclSr4rL3Pm/zhJiEQhDRf04KkJ g9vkJ9esRe/TYS7HZNu+8dd40kPaKDY2TkIDxQBB2rceB5b04Xr/vxmRG4Bh/nFvToQt SoSsIF+l6jDkO1NVV45I09IQQgL2sk+sGic8zQs4wjeuQjEc+lkkp3IiXCnfi+LHtJNS wXw/CZevWNJTqD6qJztHZwR07Qa3wn3RGR3iZWsHYVsyWz6OIHGssiC0KNXujT9KWp47 foOS8u09Maj4d9EoKxpMF2SKFsUVC3tUzIYFiiSt8MkOe0xmsmW7RsC1iFN6Z8iLaGSC aGDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TSg3pgf8JD2QoGN6Z880SoCYOhUh6LCx4/UDO+cutRU=; b=K+Ne+aS0esZyidXKEBn7oC6zC30sgWibKvk+P7XkCZAntgrs9OU2qTLthwpvzaVNrZ ppQPgmpuu4ZBDtHj9pFnQW8oPoKH9iPpttMQwl3cTv7GqREnL90C+VPi7UBpiyxp6bQi Um28EeXj8avIS4WJnxu7HmGKyvqsWlxhS6zBxVrz3mdqjeasUthbzTof81KAJS0xJaPb kapIiO8Bckwk2PlxOPrlkkGLZM3P3Y00KhkNhr14LhbvS5kzhucjbUypMgpkG0rN2Oue 0Q/zJgdOt4CvSVkpB3876P5rUbrvaddhA4qgQ3ZCR7s/mJ2t9YBd+5UDoH/X7gJPQ4yw 7K7A== X-Gm-Message-State: AFeK/H1iq5VfZgHxaZGK0y7a8sztAD5Balmew/al9FaABJb1Sn00h4o9rGgukYLKBw0hWA== X-Received: by 10.98.57.153 with SMTP id u25mr20022829pfj.111.1491277737868; Mon, 03 Apr 2017 20:48:57 -0700 (PDT) From: Ashish Mittal X-Google-Original-From: Ashish Mittal To: qemu-devel@nongnu.org, pbonzini@redhat.com, kwolf@redhat.com, armbru@redhat.com, berrange@redhat.com, jcody@redhat.com, famz@redhat.com, ashish.mittal@veritas.com, stefanha@gmail.com, Ketan.Nilangekar@veritas.com, jferlan@redhat.com, Buddhi.Madhav@veritas.com, Suraj.Singh@veritas.com, Nitin.Jerath@veritas.com, peter.maydell@linaro.org, venkatesha.mg@veritas.com, Rakesh.Ranjan@veritas.com, eblake@redhat.com Date: Mon, 3 Apr 2017 20:48:09 -0700 Message-Id: <1491277689-24949-3-git-send-email-Ashish.Mittal@veritas.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1491277689-24949-1-git-send-email-Ashish.Mittal@veritas.com> References: <1491277689-24949-1-git-send-email-Ashish.Mittal@veritas.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c05::244 Subject: [Qemu-devel] [PATCH v11 2/2] block/vxhs.c: Add qemu-iotests for new block device type "vxhs" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ashish Mittal , Abhijit.Dey@veritas.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" These changes use a vxhs test server that is a part of the following repository: https://github.com/VeritasHyperScale/libqnio.git Signed-off-by: Ashish Mittal Reviewed-by: Stefan Hajnoczi --- v11 changelog: (1) No changes. v10 changelog: (1) Redirect o/p of "$QEMU_VXHS -d $TEST_DIR" to /dev/null v9 changelog: (1) Dropped second argument to set_prog_path(). We will pick up the test server location from the user's PATH env setting. v8/v7 changelog: (1) No changes. v6 changelog: (1) Added iotests for VxHS block device. tests/qemu-iotests/common | 6 ++++++ tests/qemu-iotests/common.config | 13 +++++++++++++ tests/qemu-iotests/common.filter | 1 + tests/qemu-iotests/common.rc | 19 +++++++++++++++++++ 4 files changed, 39 insertions(+) diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common index 4d5650d..9c6f972 100644 --- a/tests/qemu-iotests/common +++ b/tests/qemu-iotests/common @@ -157,6 +157,7 @@ check options -ssh test ssh -nfs test nfs -luks test luks + -vxhs test vxhs -xdiff graphical mode diff -nocache use O_DIRECT on backing file -misalign misalign memory allocations @@ -260,6 +261,11 @@ testlist options xpand=3Dfalse ;; =20 + -vxhs) + IMGPROTO=3Dvxhs + xpand=3Dfalse + ;; + -ssh) IMGPROTO=3Dssh xpand=3Dfalse diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.c= onfig index 55527aa..c4b51b3 100644 --- a/tests/qemu-iotests/common.config +++ b/tests/qemu-iotests/common.config @@ -105,6 +105,10 @@ if [ -z "$QEMU_NBD_PROG" ]; then export QEMU_NBD_PROG=3D"`set_prog_path qemu-nbd`" fi =20 +if [ -z "$QEMU_VXHS_PROG" ]; then + export QEMU_VXHS_PROG=3D"`set_prog_path qnio_server`" +fi + _qemu_wrapper() { ( @@ -156,10 +160,19 @@ _qemu_nbd_wrapper() ) } =20 +_qemu_vxhs_wrapper() +{ + ( + echo $BASHPID > "${TEST_DIR}/qemu-vxhs.pid" + exec "$QEMU_VXHS_PROG" $QEMU_VXHS_OPTIONS "$@" + ) +} + export QEMU=3D_qemu_wrapper export QEMU_IMG=3D_qemu_img_wrapper export QEMU_IO=3D_qemu_io_wrapper export QEMU_NBD=3D_qemu_nbd_wrapper +export QEMU_VXHS=3D_qemu_vxhs_wrapper =20 QEMU_IMG_EXTRA_ARGS=3D if [ "$IMGOPTSSYNTAX" =3D "true" ]; then diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.f= ilter index 1040013..c9a2d5c 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -122,6 +122,7 @@ _filter_img_info() -e "s#$TEST_DIR#TEST_DIR#g" \ -e "s#$IMGFMT#IMGFMT#g" \ -e 's#nbd://127.0.0.1:10810$#TEST_DIR/t.IMGFMT#g' \ + -e 's#json.*vdisk-id.*vxhs"}}#TEST_DIR/t.IMGFMT#' \ -e "/encrypted: yes/d" \ -e "/cluster_size: [0-9]\\+/d" \ -e "/table_size: [0-9]\\+/d" \ diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 7d4781d..62529ee 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -85,6 +85,9 @@ else elif [ "$IMGPROTO" =3D "nfs" ]; then TEST_DIR=3D"nfs://127.0.0.1/$TEST_DIR" TEST_IMG=3D$TEST_DIR/t.$IMGFMT + elif [ "$IMGPROTO" =3D "vxhs" ]; then + TEST_IMG_FILE=3D$TEST_DIR/t.$IMGFMT + TEST_IMG=3D"vxhs://127.0.0.1:9999/t.$IMGFMT" else TEST_IMG=3D$IMGPROTO:$TEST_DIR/t.$IMGFMT fi @@ -171,6 +174,12 @@ _make_test_img() eval "$QEMU_NBD -v -t -b 127.0.0.1 -p 10810 -f $IMGFMT $TEST_IMG_= FILE >/dev/null &" sleep 1 # FIXME: qemu-nbd needs to be listening before we continue fi + + # Start QNIO server on image directory for vxhs protocol + if [ $IMGPROTO =3D "vxhs" ]; then + eval "$QEMU_VXHS -d $TEST_DIR > /dev/null &" + sleep 1 # Wait for server to come up. + fi } =20 _rm_test_img() @@ -197,6 +206,16 @@ _cleanup_test_img() fi rm -f "$TEST_IMG_FILE" ;; + vxhs) + if [ -f "${TEST_DIR}/qemu-vxhs.pid" ]; then + local QEMU_VXHS_PID + read QEMU_VXHS_PID < "${TEST_DIR}/qemu-vxhs.pid" + kill ${QEMU_VXHS_PID} >/dev/null 2>&1 + rm -f "${TEST_DIR}/qemu-vxhs.pid" + fi + rm -f "$TEST_IMG_FILE" + ;; + file) _rm_test_img "$TEST_DIR/t.$IMGFMT" _rm_test_img "$TEST_DIR/t.$IMGFMT.orig" --=20 2.5.5