Commit 8fabb8be authored by Max Reitz's avatar Max Reitz Committed by Eric Blake
Browse files

iotests: Make 182 do without device_add 



182 fails if qemu has no support for hotplugging of a virtio-blk device.
Using an NBD server instead works just as well for the test, even on
qemus without hotplugging support.

Fixes: 6d0a4a0f
Reported-by: default avatarDanilo C. L. de Paula <ddepaula@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Message-Id: <20190417153005.30096-1-mreitz@redhat.com>
Tested-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Acked-by: default avatarAlberto Garcia <berto@igalia.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent d3192de7

tests/qemu-iotests/182

+17 −5
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ _cleanup() 
{

    _cleanup_test_img

    rm -f "$TEST_IMG.overlay"

    rm -f "$TEST_DIR/nbd.socket"

}

trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -126,15 +127,26 @@ success_or_failure=y _send_qemu_cmd $QEMU_HANDLE \ 
    'return' \

    'error'



# Now we attach the image to a virtio-blk device.  This device does

# require some permissions (at least WRITE and READ_CONSISTENT), so if

# Start an NBD server to which we can attach node1

success_or_failure=y _send_qemu_cmd $QEMU_HANDLE \

    "{'execute': 'nbd-server-start',

      'arguments': {

          'addr': {

              'type': 'unix',

              'data': {

                  'path': '$TEST_DIR/nbd.socket'

              } } } }" \

    'return' \

    'error'



# Now we attach the image to the NBD server.  This server does require

# some permissions (at least WRITE and READ_CONSISTENT), so if

# reopening node0 unshared any (which it should not have), this will

# fail (but it should not).

success_or_failure=y _send_qemu_cmd $QEMU_HANDLE \

    "{'execute': 'device_add',

    "{'execute': 'nbd-server-add',

      'arguments': {

          'driver': 'virtio-blk',

          'drive': 'node1'

          'device': 'node1'

      } }" \

    'return' \

    'error'

tests/qemu-iotests/182.out

+1 −0
Original line number Diff line number Diff line
@@ -14,4 +14,5 @@ Formatting 'TEST_DIR/t.qcow2.overlay', fmt=qcow2 size=197120 backing_file=TEST_D 
{"return": {}}

{"return": {}}

{"return": {}}

{"return": {}}

*** done