On 11/18/19 4:18 PM, Eric Blake wrote:
If anything, I'm inclined to use $SOCK_DIR/nbd.raw to indicate that
the NBD client sees raw format, regardless of the format in use by the
server, to leave the door open for $SOCK_DIR/nbd.qcow2 when we finally
are happy to test qcow2 format over NBD.
Naming the socket $SOCK_DIR/nbd.raw means that filters tend to rename it
to $SOCK_DIR/nbd.IMGFMT before my attempt to rename everything to
TEST_DIR/t.IMGFMT. So I'm now leaning towards just naming the socket
$SOCK_DIR/nbd and leave it at that.
Or stick to just $SOCK_DIR/nbd hard-coded everywhere, and quit trying
to use $IMGFMT in the socket name, to make all the usage consistent.
In order to get my NBD 4.2-rc2 pull request out, I'll be squashing this
in (having tested that my usual iotest configurations still pass)::
diff --git i/tests/qemu-iotests/common.rc w/tests/qemu-iotests/common.rc
index f772dcb67322..0cc8acc9edd2 100644
--- i/tests/qemu-iotests/common.rc
+++ w/tests/qemu-iotests/common.rc
@@ -217,7 +217,7 @@ if [ "$IMGOPTSSYNTAX" = "true" ]; then
TEST_IMG="$DRIVER,file.filename=$TEST_DIR/t.$IMGFMT"
elif [ "$IMGPROTO" = "nbd" ]; then
TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
-
TEST_IMG="$DRIVER,file.driver=nbd,file.type=unix,file.path=$SOCKDIR/$IMGFMT"
+
TEST_IMG="$DRIVER,file.driver=nbd,file.type=unix,file.path=$SOCKDIR/nbd"
elif [ "$IMGPROTO" = "ssh" ]; then
TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
TEST_IMG="$DRIVER,file.driver=ssh,file.host=127.0.0.1,file.path=$TEST_IMG_FILE"
@@ -349,7 +349,10 @@ _make_test_img()
fi
) | _filter_img_create
- # Start an NBD server on the image file, which is what we'll be
talking to
+ # Start an NBD server on the image file, which is what we'll be
talking to.
+ # Once NBD gains resize support, we may also want to use -f raw at the
+ # server and interpret format over NBD, but for now, the format is
+ # interpreted at the server and raw data sent over NBD.
if [ $IMGPROTO = "nbd" ]; then
# Pass a sufficiently high number to -e that should be enough
for all
# tests
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
