mirror of
https://github.com/qemu/qemu.git
synced 2025-10-31 04:06:46 +00:00
985cac8f20
It's unused now (except for permission handling)[*]. The only reasonable user of it was block-stream job, recently updated to use own blk. And other block jobs prefer to use own source node related objects. So, the arguments of dropping the field are: - block jobs prefer not to use it - block jobs usually has more then one node to operate on, and better to operate symmetrically (for example has both source and target blk's in specific block-job state structure) *: BlockJob.blk is used to keep some permissions. We simply move permissions to block-job child created in block_job_create() together with blk. In mirror, we just should not care anymore about restoring state of blk. Most probably this code could be dropped long ago, after dropping bs->job pointer. Now it finally goes away together with BlockJob.blk itself. iotest 141 output is updated, as "bdrv_has_blk(bs)" check in qmp_blockdev_del() doesn't fail (we don't have blk now). Still, new error message looks even better. In iotest 283 we need to add a job id, otherwise "Invalid job ID" happens now earlier than permission check (as permissions moved from blk to block-job node). Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Nikita Lapshin <nikita.lapshin@virtuozzo.com>
180 lines
10 KiB
Plaintext
180 lines
10 KiB
Plaintext
QA output created by 141
|
|
Formatting 'TEST_DIR/b.IMGFMT', fmt=IMGFMT size=1048576
|
|
Formatting 'TEST_DIR/m.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/b.IMGFMT backing_fmt=IMGFMT
|
|
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/m.IMGFMT backing_fmt=IMGFMT
|
|
{'execute': 'qmp_capabilities'}
|
|
{"return": {}}
|
|
|
|
=== Testing drive-backup ===
|
|
|
|
{'execute': 'blockdev-add',
|
|
'arguments': {
|
|
'node-name': 'drv0',
|
|
'driver': 'IMGFMT',
|
|
'file': {
|
|
'driver': 'file',
|
|
'filename': 'TEST_DIR/t.IMGFMT'
|
|
}}}
|
|
{"return": {}}
|
|
{'execute': 'drive-backup',
|
|
'arguments': {'job-id': 'job0',
|
|
'device': 'drv0',
|
|
'target': 'TEST_DIR/o.IMGFMT',
|
|
'format': 'IMGFMT',
|
|
'sync': 'none'}}
|
|
Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "paused", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
|
|
{'execute': 'blockdev-del',
|
|
'arguments': {'node-name': 'drv0'}}
|
|
{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: node is used as backing hd of 'NODE_NAME'"}}
|
|
{'execute': 'block-job-cancel',
|
|
'arguments': {'device': 'job0'}}
|
|
{"return": {}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "job0", "len": 1048576, "offset": 0, "speed": 0, "type": "backup"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
|
|
{'execute': 'blockdev-del',
|
|
'arguments': {'node-name': 'drv0'}}
|
|
{"return": {}}
|
|
|
|
=== Testing drive-mirror ===
|
|
|
|
{'execute': 'blockdev-add',
|
|
'arguments': {
|
|
'node-name': 'drv0',
|
|
'driver': 'IMGFMT',
|
|
'file': {
|
|
'driver': 'file',
|
|
'filename': 'TEST_DIR/t.IMGFMT'
|
|
}}}
|
|
{"return": {}}
|
|
{'execute': 'drive-mirror',
|
|
'arguments': {'job-id': 'job0',
|
|
'device': 'drv0',
|
|
'target': 'TEST_DIR/o.IMGFMT',
|
|
'format': 'IMGFMT',
|
|
'sync': 'none'}}
|
|
Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "mirror"}}
|
|
{'execute': 'blockdev-del',
|
|
'arguments': {'node-name': 'drv0'}}
|
|
{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: mirror"}}
|
|
{'execute': 'block-job-cancel',
|
|
'arguments': {'device': 'job0'}}
|
|
{"return": {}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "mirror"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
|
|
{'execute': 'blockdev-del',
|
|
'arguments': {'node-name': 'drv0'}}
|
|
{"return": {}}
|
|
|
|
=== Testing active block-commit ===
|
|
|
|
{'execute': 'blockdev-add',
|
|
'arguments': {
|
|
'node-name': 'drv0',
|
|
'driver': 'IMGFMT',
|
|
'file': {
|
|
'driver': 'file',
|
|
'filename': 'TEST_DIR/t.IMGFMT'
|
|
}}}
|
|
{"return": {}}
|
|
{'execute': 'block-commit',
|
|
'arguments': {'job-id': 'job0', 'device': 'drv0'}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
|
|
{'execute': 'blockdev-del',
|
|
'arguments': {'node-name': 'drv0'}}
|
|
{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: commit"}}
|
|
{'execute': 'block-job-cancel',
|
|
'arguments': {'device': 'job0'}}
|
|
{"return": {}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
|
|
{'execute': 'blockdev-del',
|
|
'arguments': {'node-name': 'drv0'}}
|
|
{"return": {}}
|
|
|
|
=== Testing non-active block-commit ===
|
|
|
|
wrote 1048576/1048576 bytes at offset 0
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
{'execute': 'blockdev-add',
|
|
'arguments': {
|
|
'node-name': 'drv0',
|
|
'driver': 'IMGFMT',
|
|
'file': {
|
|
'driver': 'file',
|
|
'filename': 'TEST_DIR/t.IMGFMT'
|
|
}}}
|
|
{"return": {}}
|
|
{'execute': 'block-commit',
|
|
'arguments': {'job-id': 'job0',
|
|
'device': 'drv0',
|
|
'top': 'TEST_DIR/m.IMGFMT',
|
|
'speed': 1}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
|
|
{'execute': 'blockdev-del',
|
|
'arguments': {'node-name': 'drv0'}}
|
|
{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: commit"}}
|
|
{'execute': 'block-job-cancel',
|
|
'arguments': {'device': 'job0'}}
|
|
{"return": {}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "job0", "len": 1048576, "offset": 524288, "speed": 1, "type": "commit"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
|
|
{'execute': 'blockdev-del',
|
|
'arguments': {'node-name': 'drv0'}}
|
|
{"return": {}}
|
|
|
|
=== Testing block-stream ===
|
|
|
|
wrote 1048576/1048576 bytes at offset 0
|
|
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
{'execute': 'blockdev-add',
|
|
'arguments': {
|
|
'node-name': 'drv0',
|
|
'driver': 'IMGFMT',
|
|
'file': {
|
|
'driver': 'file',
|
|
'filename': 'TEST_DIR/t.IMGFMT'
|
|
}}}
|
|
{"return": {}}
|
|
{'execute': 'block-stream',
|
|
'arguments': {'job-id': 'job0',
|
|
'device': 'drv0',
|
|
'speed': 1}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
|
|
{'execute': 'blockdev-del',
|
|
'arguments': {'node-name': 'drv0'}}
|
|
{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: stream"}}
|
|
{'execute': 'block-job-cancel',
|
|
'arguments': {'device': 'job0'}}
|
|
{"return": {}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "job0", "len": 1048576, "offset": 524288, "speed": 1, "type": "stream"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}
|
|
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
|
|
{'execute': 'blockdev-del',
|
|
'arguments': {'node-name': 'drv0'}}
|
|
{"return": {}}
|
|
*** done
|