Am 01.11.2012 12:30, schrieb Nicholas Thomas: > On Wed, 2012-10-31 at 17:44 +0100, Kevin Wolf wrote: >> Am 31.10.2012 15:33, schrieb Paolo Bonzini: >>> Il 31/10/2012 15:01, n...@bytemark.co.uk ha scritto: >>>> From: Nick Thomas <n...@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 <n...@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. > > Good catch, thanks. > >> It would be nice to require it only if we're really using NBD, is this >> already known at this place? > > $IMGPROTO is how we'd discriminate, and that's set in > qemu-iotests/common, which is sourced after qemu-iotests/common.config, > at least by qemu-iotests/check. > > There's actually a similar set of tests in common (where we *do* have > $IMGPROTO), so maybe the ones in common.config are unnecessary, and can > be removed?
Hm, yes, I think so. And when you touch common to add a qemu-nbd check, you can fix the message for qemu-io, too: [ "$QEMU_IO" = "" ] && _fatal "qemu-img not found" Kevin
