Message ID | 20171109221216.10248-1-eblake@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 2017-11-09 23:12, Eric Blake wrote: > Old-style NBD is deprecated upstream (it is documented, but no > longer implemented in the reference implementation), and it is > severely limited (it cannot support structured replies, which > means it cannot support efficient handling of zeroes), when > compared to new-style NBD. We are better off having our iotests > favor new-style everywhere (although some explicit tests, > particularly 83, still cover old-style for back-compat reasons); > this is as simple as supplying the empty string as the default > export name, as it does not change the URI needed to connect a > client to the server. This also gives us more coverage of the > just-added structured reply code, when not overriding $QEMU_NBD > to intentionally point to an older server. > > Signed-off-by: Eric Blake <eblake@redhat.com> > --- > > Proposing this for 2.11; it can either go in through the NBD > tree (although I just send my 2.11-rc1 pull request) or through > Max' iotest tree. random.org said 1, so: Thanks, applied to my block branch: https://github.com/XanClic/qemu/commits/block Max
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 0e8a33c696..dbae7d74ba 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -242,7 +242,7 @@ _make_test_img() if [ $IMGPROTO = "nbd" ]; then # Pass a sufficiently high number to -e that should be enough for all # tests - eval "$QEMU_NBD -v -t -b 127.0.0.1 -p 10810 -f $IMGFMT -e 42 $TEST_IMG_FILE >/dev/null &" + eval "$QEMU_NBD -v -t -b 127.0.0.1 -p 10810 -f $IMGFMT -e 42 -x '' $TEST_IMG_FILE >/dev/null &" sleep 1 # FIXME: qemu-nbd needs to be listening before we continue fi
Old-style NBD is deprecated upstream (it is documented, but no longer implemented in the reference implementation), and it is severely limited (it cannot support structured replies, which means it cannot support efficient handling of zeroes), when compared to new-style NBD. We are better off having our iotests favor new-style everywhere (although some explicit tests, particularly 83, still cover old-style for back-compat reasons); this is as simple as supplying the empty string as the default export name, as it does not change the URI needed to connect a client to the server. This also gives us more coverage of the just-added structured reply code, when not overriding $QEMU_NBD to intentionally point to an older server. Signed-off-by: Eric Blake <eblake@redhat.com> --- Proposing this for 2.11; it can either go in through the NBD tree (although I just send my 2.11-rc1 pull request) or through Max' iotest tree. tests/qemu-iotests/common.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)