From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:50505)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1TTbPV-0006p9-8K
	for qemu-devel@nongnu.org; Wed, 31 Oct 2012 12:45:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1TTbPQ-00081w-SR
	for qemu-devel@nongnu.org; Wed, 31 Oct 2012 12:44:57 -0400
Received: from mx1.redhat.com ([209.132.183.28]:35600)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1TTbPQ-00080u-JQ
	for qemu-devel@nongnu.org; Wed, 31 Oct 2012 12:44:52 -0400
Message-ID: <50915579.9030700@redhat.com>
Date: Wed, 31 Oct 2012 17:44:41 +0100
From: Kevin Wolf <kwolf@redhat.com>
MIME-Version: 1.0
References: <1351692068-4266-1-git-send-email-nick@bytemark.co.uk>
	<509136D3.7020706@redhat.com>
In-Reply-To: <509136D3.7020706@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] tests: allow qemu-iotests to be run
	against nbd backend
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org, nick@bytemark.co.uk

Am 31.10.2012 15:33, schrieb Paolo Bonzini:
> Il 31/10/2012 15:01, nick@bytemark.co.uk ha scritto:
>> From: Nick Thomas <nick@bytemark.co.uk>
>>
>> To do this, we start a qemu-nbd process at _make_test_img and kill
>> it in _cleanup_test_img. $TEST_IMG is changed to point at the TCP
>> server.
>>
>> Signed-off-by: Nick Thomas <nick@bytemark.co.uk>
>> ---
>>  tests/qemu-iotests/common        |    7 +++++--
>>  tests/qemu-iotests/common.config |    8 +++++++-
>>  tests/qemu-iotests/common.rc     |   23 ++++++++++++++++++++++-
>>  3 files changed, 34 insertions(+), 4 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
>> index 1f6fdf5..09dfdf1 100644
>> --- a/tests/qemu-iotests/common
>> +++ b/tests/qemu-iotests/common
>> @@ -136,6 +136,7 @@ check options
>>      -vmdk               test vmdk
>>      -rbd                test rbd
>>      -sheepdog           test sheepdog
>> +    -nbd                test nbd
>>      -xdiff		graphical mode diff
>>      -nocache		use O_DIRECT on backing file
>>      -misalign		misalign memory allocations
>> @@ -197,12 +198,14 @@ testlist options
>>  	    IMGPROTO=rbd
>>  	    xpand=false
>>  	    ;;
>> -
>>  	-sheepdog)
>>  	    IMGPROTO=sheepdog
>>  	    xpand=false
>>  	    ;;
>> -
>> +    -nbd)
>> +        IMGPROTO=nbd
>> +        xpand=false
>> +        ;;
>>  	-nocache)
>>  	    QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --nocache"
>>  	    xpand=false
>> diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config
>> index df082e7..5383e4d 100644
>> --- a/tests/qemu-iotests/common.config
>> +++ b/tests/qemu-iotests/common.config
>> @@ -102,9 +102,15 @@ if [ -z "$QEMU_IO_PROG" ]; then
>>  fi
>>  [ "$QEMU_IO_PROG" = "" ] && _fatal "qemu-io not found"
>>  
>> +if [ -z "$QEMU_NBD_PROG" ]; then
>> +    export QEMU_NBD_PROG="`set_prog_path qemu-nbd`"
>> +fi
>> +[ "$QEMU_IO_PROG" = "" ] && _fatal "qemu-io not found"

I think you intended to check $QEMU_NBD_PROG.

It would be nice to require it only if we're really using NBD, is this
already known at this place?

Kevin