ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Kevin Wolf 2016-09-21 14:56:10 +02:00
parent e467da7b92
commit 7864588150
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/qemu-iotests/141
View File

@ -51,7 +51,7 @@ test_blockjob()
"{'execute': 'blockdev-add', "{'execute': 'blockdev-add',
'arguments': { 'arguments': {
'options': { 'options': {
'id': 'drv0', 'node-name': 'drv0',
'driver': '$IMGFMT', 'driver': '$IMGFMT',
'file': { 'file': {
'driver': 'file', 'driver': 'file',
@ -66,18 +66,18 @@ test_blockjob()
# We want this to return an error because the block job is still running # We want this to return an error because the block job is still running
_send_qemu_cmd $QEMU_HANDLE \ _send_qemu_cmd $QEMU_HANDLE \
"{'execute': 'x-blockdev-remove-medium', "{'execute': 'x-blockdev-del',
'arguments': {'device': 'drv0'}}" \ 'arguments': {'node-name': 'drv0'}}" \
'error' 'error'
_send_qemu_cmd $QEMU_HANDLE \ _send_qemu_cmd $QEMU_HANDLE \
"{'execute': 'block-job-cancel', "{'execute': 'block-job-cancel',
'arguments': {'device': 'drv0'}}" \ 'arguments': {'device': 'job0'}}" \
"$3" "$3"
_send_qemu_cmd $QEMU_HANDLE \ _send_qemu_cmd $QEMU_HANDLE \
"{'execute': 'x-blockdev-del', "{'execute': 'x-blockdev-del',
'arguments': {'id': 'drv0'}}" \ 'arguments': {'node-name': 'drv0'}}" \
'return' 'return'
} }
@ -101,7 +101,8 @@ echo
test_blockjob \ test_blockjob \
"{'execute': 'drive-backup', "{'execute': 'drive-backup',
'arguments': {'device': 'drv0', 'arguments': {'job-id': 'job0',
'device': 'drv0',
'target': '$TEST_DIR/o.$IMGFMT', 'target': '$TEST_DIR/o.$IMGFMT',
'format': '$IMGFMT', 'format': '$IMGFMT',
'sync': 'none'}}" \ 'sync': 'none'}}" \
@ -117,7 +118,8 @@ echo
test_blockjob \ test_blockjob \
"{'execute': 'drive-mirror', "{'execute': 'drive-mirror',
'arguments': {'device': 'drv0', 'arguments': {'job-id': 'job0',
'device': 'drv0',
'target': '$TEST_DIR/o.$IMGFMT', 'target': '$TEST_DIR/o.$IMGFMT',
'format': '$IMGFMT', 'format': '$IMGFMT',
'sync': 'none'}}" \ 'sync': 'none'}}" \
@ -134,7 +136,7 @@ echo
test_blockjob \ test_blockjob \
"{'execute': 'block-commit', "{'execute': 'block-commit',
'arguments': {'device': 'drv0'}}" \ 'arguments': {'job-id': 'job0', 'device': 'drv0'}}" \
'BLOCK_JOB_READY' \ 'BLOCK_JOB_READY' \
'BLOCK_JOB_COMPLETED' 'BLOCK_JOB_COMPLETED'
@ -150,7 +152,8 @@ $QEMU_IO -c 'write 0 1M' "$TEST_DIR/m.$IMGFMT" | _filter_qemu_io
test_blockjob \ test_blockjob \
"{'execute': 'block-commit', "{'execute': 'block-commit',
'arguments': {'device': 'drv0', 'arguments': {'job-id': 'job0',
'device': 'drv0',
'top': '$TEST_DIR/m.$IMGFMT', 'top': '$TEST_DIR/m.$IMGFMT',
'speed': 1}}" \ 'speed': 1}}" \
'return' \ 'return' \
@ -172,7 +175,8 @@ $QEMU_IO -c 'write 0 1M' "$TEST_DIR/b.$IMGFMT" | _filter_qemu_io
test_blockjob \ test_blockjob \
"{'execute': 'block-stream', "{'execute': 'block-stream',
'arguments': {'device': 'drv0', 'arguments': {'job-id': 'job0',
'device': 'drv0',
'speed': 1}}" \ 'speed': 1}}" \
'return' \ 'return' \
'BLOCK_JOB_CANCELLED' 'BLOCK_JOB_CANCELLED'

24
tests/qemu-iotests/141.out
View File

@ -9,30 +9,30 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/m.
{"return": {}} {"return": {}}
Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT
{"return": {}} {"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": {}} {"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": {}} {"return": {}}
=== Testing drive-mirror === === Testing drive-mirror ===
{"return": {}} {"return": {}}
Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT 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": {}} {"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": {}} {"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": {}} {"return": {}}
=== Testing active block-commit === === Testing active block-commit ===
{"return": {}} {"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": {}} {"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": {}} {"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": {}} {"return": {}}
=== Testing non-active block-commit === === 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) 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
{"return": {}} {"return": {}}
{"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": {}} {"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": {}} {"return": {}}
=== Testing block-stream === === 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) 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
{"return": {}} {"return": {}}
{"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": {}} {"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": {}} {"return": {}}
*** done *** done