Commit 45e92a90 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

nbd-server: Call blk_set_allow_aio_context_change() 



The NBD server uses an AioContext notifier, so it can tolerate that its
BlockBackend is switched to a different AioContext. Before we start
actually calling bdrv_try_set_aio_context(), which checks for
consistency, outside of test cases, we need to make sure that the NBD
server actually allows this.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent 087ba459

nbd/server.c

+1 −0
Original line number Diff line number Diff line
@@ -1491,6 +1491,7 @@ NBDExport *nbd_export_new(BlockDriverState *bs, uint64_t dev_offset, 
        goto fail;

    }

    blk_set_enable_write_cache(blk, !writethrough);

    blk_set_allow_aio_context_change(blk, true);



    exp->refcount = 1;

    QTAILQ_INIT(&exp->clients);

tests/qemu-iotests/240

+21 −0
Original line number Diff line number Diff line
@@ -27,6 +27,12 @@ echo "QA output created by $seq" 


status=1	# failure is the default!



_cleanup()

{

    rm -f "$TEST_DIR/nbd"

}

trap "_cleanup; exit \$status" 0 1 2 3 15



# get standard environment, filters and checks

. ./common.rc

. ./common.filter
@@ -122,6 +128,21 @@ run_qemu <<EOF 
{ "execute": "quit"}

EOF



echo

echo === Attach a SCSI disks using the same block device as a NBD server ===

echo



run_qemu <<EOF

{ "execute": "qmp_capabilities" }

{ "execute": "blockdev-add", "arguments": {"driver": "null-co", "node-name": "hd0", "read-only": true}}

{ "execute": "nbd-server-start", "arguments": {"addr":{"type":"unix","data":{"path":"$TEST_DIR/nbd"}}}}

{ "execute": "nbd-server-add", "arguments": {"device":"hd0"}}

{ "execute": "object-add", "arguments": {"qom-type": "iothread", "id": "iothread0"}}

{ "execute": "device_add", "arguments": {"id": "scsi0", "driver": "${virtio_scsi}", "iothread": "iothread0"}}

{ "execute": "device_add", "arguments": {"id": "scsi-hd0", "driver": "scsi-hd", "drive": "hd0", "bus": "scsi0.0"}}

{ "execute": "quit"}

EOF



# success, all done

echo "*** done"

rm -f $seq.full

tests/qemu-iotests/240.out

+13 −0
Original line number Diff line number Diff line
@@ -51,4 +51,17 @@ QMP_VERSION 
{"return": {}}

{"return": {}}

{"return": {}}



=== Attach a SCSI disks using the same block device as a NBD server ===



Testing:

QMP_VERSION

{"return": {}}

{"return": {}}

{"return": {}}

{"return": {}}

{"return": {}}

{"return": {}}

{"return": {}}

{"return": {}}

*** done