Commit 78645881 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

qemu-iotests/141: Avoid blockdev-add with id 



We want to remove the 'id' option for blockdev-add. This removes one
user of the option and makes it use only node names.

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

tests/qemu-iotests/141

+14 −10
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ test_blockjob() 
        "{'execute': 'blockdev-add',

          'arguments': {

              'options': {

                  'id': 'drv0',

                  'node-name': 'drv0',

                  'driver': '$IMGFMT',

                  'file': {

                      'driver': 'file',
@@ -66,18 +66,18 @@ test_blockjob() 


    # We want this to return an error because the block job is still running

    _send_qemu_cmd $QEMU_HANDLE \

        "{'execute': 'x-blockdev-remove-medium',

          'arguments': {'device': 'drv0'}}" \

        "{'execute': 'x-blockdev-del',

          'arguments': {'node-name': 'drv0'}}" \

        'error'



    _send_qemu_cmd $QEMU_HANDLE \

        "{'execute': 'block-job-cancel',

          'arguments': {'device': 'drv0'}}" \

          'arguments': {'device': 'job0'}}" \

        "$3"



    _send_qemu_cmd $QEMU_HANDLE \

        "{'execute': 'x-blockdev-del',

          'arguments': {'id': 'drv0'}}" \

          'arguments': {'node-name': 'drv0'}}" \

        'return'

}
@@ -101,7 +101,8 @@ echo 


test_blockjob \

    "{'execute': 'drive-backup',

      'arguments': {'device': 'drv0',

      'arguments': {'job-id': 'job0',

                    'device': 'drv0',

                    'target': '$TEST_DIR/o.$IMGFMT',

                    'format': '$IMGFMT',

                    'sync': 'none'}}" \
@@ -117,7 +118,8 @@ echo 


test_blockjob \

    "{'execute': 'drive-mirror',

      'arguments': {'device': 'drv0',

      'arguments': {'job-id': 'job0',

                    'device': 'drv0',

                    'target': '$TEST_DIR/o.$IMGFMT',

                    'format': '$IMGFMT',

                    'sync': 'none'}}" \
@@ -134,7 +136,7 @@ echo 


test_blockjob \

    "{'execute': 'block-commit',

      'arguments': {'device': 'drv0'}}" \

      'arguments': {'job-id': 'job0', 'device': 'drv0'}}" \

    'BLOCK_JOB_READY' \

    'BLOCK_JOB_COMPLETED'
@@ -150,7 +152,8 @@ $QEMU_IO -c 'write 0 1M' "$TEST_DIR/m.$IMGFMT" | _filter_qemu_io 


test_blockjob \

    "{'execute': 'block-commit',

      'arguments': {'device': 'drv0',

      'arguments': {'job-id': 'job0',

                    'device': 'drv0',

                    'top':    '$TEST_DIR/m.$IMGFMT',

                    'speed':  1}}" \

    'return' \
@@ -172,7 +175,8 @@ $QEMU_IO -c 'write 0 1M' "$TEST_DIR/b.$IMGFMT" | _filter_qemu_io 


test_blockjob \

    "{'execute': 'block-stream',

      'arguments': {'device': 'drv0',

      'arguments': {'job-id': 'job0',

                    'device': 'drv0',

                    'speed': 1}}" \

    'return' \

    'BLOCK_JOB_CANCELLED'

tests/qemu-iotests/141.out

+12 −12
Original line number Diff line number Diff line
@@ -9,30 +9,30 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/m. 
{"return": {}}

Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT

{"return": {}}

{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: backup"}}

{"error": {"class": "GenericError", "desc": "Node drv0 is in use"}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "drv0", "len": 1048576, "offset": 0, "speed": 0, "type": "backup"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "job0", "len": 1048576, "offset": 0, "speed": 0, "type": "backup"}}

{"return": {}}



=== Testing drive-mirror ===



{"return": {}}

Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "drv0", "len": 0, "offset": 0, "speed": 0, "type": "mirror"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "mirror"}}

{"return": {}}

{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: mirror"}}

{"error": {"class": "GenericError", "desc": "Node drv0 is in use"}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "drv0", "len": 0, "offset": 0, "speed": 0, "type": "mirror"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "mirror"}}

{"return": {}}



=== Testing active block-commit ===



{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "drv0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}

{"return": {}}

{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: commit"}}

{"error": {"class": "GenericError", "desc": "Node drv0 is in use"}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "drv0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}

{"return": {}}



=== Testing non-active block-commit ===
@@ -41,9 +41,9 @@ wrote 1048576/1048576 bytes at offset 0 
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

{"return": {}}

{"return": {}}

{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: commit"}}

{"error": {"class": "GenericError", "desc": "Node drv0 is in use"}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "drv0", "len": 1048576, "offset": 524288, "speed": 1, "type": "commit"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "job0", "len": 1048576, "offset": 524288, "speed": 1, "type": "commit"}}

{"return": {}}



=== Testing block-stream ===
@@ -52,8 +52,8 @@ wrote 1048576/1048576 bytes at offset 0 
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

{"return": {}}

{"return": {}}

{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: stream"}}

{"error": {"class": "GenericError", "desc": "Node drv0 is in use"}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "drv0", "len": 1048576, "offset": 524288, "speed": 1, "type": "stream"}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "job0", "len": 1048576, "offset": 524288, "speed": 1, "type": "stream"}}

{"return": {}}

*** done