f436c94102
The relative ordering of "device_del" return value and the "DEVICE_DELETED" QMP event depends on the architecture being tested. On x86 unplugging virtio disks is asynchronous (=qdev_unplug()= → =hotplug_handler_unplug_request()=) while on s390x it is synchronous (=qdev_unplug()= → =hotplug_handler_unplug()=). This leads to the actual output on s390x consistently differing from the reference output (that was probably produced on x86). The easiest way to address this is to filter out QMP events in 067. The DEVICE_DELETED event is already getting explicitly tested by the Python-based test case 139, so the test coverage should be unaffected. Make use of the recently introduced _filter_qmp_events() to remove QMP events from the test case output and adjust the reference output accordingly. The tr / sed / tr trick used for filtering was suggested by Max Reitz <mreitz@redhat.com>. Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com> Message-id: 1455886869-139916-2-git-send-email-silbe@linux.vnet.ibm.com Signed-off-by: Max Reitz <mreitz@redhat.com>
374 lines
8.8 KiB
Plaintext
374 lines
8.8 KiB
Plaintext
QA output created by 067
|
|
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
|
|
|
|
=== -drive/-device and device_del ===
|
|
|
|
Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virtio-blk,drive=disk,id=virtio0
|
|
{
|
|
QMP_VERSION
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": [
|
|
{
|
|
"io-status": "ok",
|
|
"device": "disk",
|
|
"locked": false,
|
|
"removable": false,
|
|
"inserted": {
|
|
"iops_rd": 0,
|
|
"detect_zeroes": "off",
|
|
"image": {
|
|
"virtual-size": 134217728,
|
|
"filename": "TEST_DIR/t.qcow2",
|
|
"cluster-size": 65536,
|
|
"format": "qcow2",
|
|
"actual-size": SIZE,
|
|
"format-specific": {
|
|
"type": "qcow2",
|
|
"data": {
|
|
"compat": "1.1",
|
|
"lazy-refcounts": false,
|
|
"refcount-bits": 16,
|
|
"corrupt": false
|
|
}
|
|
},
|
|
"dirty-flag": false
|
|
},
|
|
"iops_wr": 0,
|
|
"ro": false,
|
|
"node-name": "NODE_NAME",
|
|
"backing_file_depth": 0,
|
|
"drv": "qcow2",
|
|
"iops": 0,
|
|
"bps_wr": 0,
|
|
"write_threshold": 0,
|
|
"encrypted": false,
|
|
"bps": 0,
|
|
"bps_rd": 0,
|
|
"cache": {
|
|
"no-flush": false,
|
|
"direct": false,
|
|
"writeback": true
|
|
},
|
|
"file": "TEST_DIR/t.qcow2",
|
|
"encryption_key_missing": false
|
|
},
|
|
"type": "unknown"
|
|
}
|
|
]
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": [
|
|
]
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
|
|
=== -drive/device_add and device_del ===
|
|
|
|
Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk
|
|
{
|
|
QMP_VERSION
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": [
|
|
{
|
|
"device": "disk",
|
|
"locked": false,
|
|
"removable": true,
|
|
"inserted": {
|
|
"iops_rd": 0,
|
|
"detect_zeroes": "off",
|
|
"image": {
|
|
"virtual-size": 134217728,
|
|
"filename": "TEST_DIR/t.qcow2",
|
|
"cluster-size": 65536,
|
|
"format": "qcow2",
|
|
"actual-size": SIZE,
|
|
"format-specific": {
|
|
"type": "qcow2",
|
|
"data": {
|
|
"compat": "1.1",
|
|
"lazy-refcounts": false,
|
|
"refcount-bits": 16,
|
|
"corrupt": false
|
|
}
|
|
},
|
|
"dirty-flag": false
|
|
},
|
|
"iops_wr": 0,
|
|
"ro": false,
|
|
"node-name": "NODE_NAME",
|
|
"backing_file_depth": 0,
|
|
"drv": "qcow2",
|
|
"iops": 0,
|
|
"bps_wr": 0,
|
|
"write_threshold": 0,
|
|
"encrypted": false,
|
|
"bps": 0,
|
|
"bps_rd": 0,
|
|
"cache": {
|
|
"no-flush": false,
|
|
"direct": false,
|
|
"writeback": true
|
|
},
|
|
"file": "TEST_DIR/t.qcow2",
|
|
"encryption_key_missing": false
|
|
},
|
|
"type": "unknown"
|
|
}
|
|
]
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": [
|
|
]
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
|
|
=== drive_add/device_add and device_del ===
|
|
|
|
Testing:
|
|
{
|
|
QMP_VERSION
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": "OK\r\n"
|
|
}
|
|
{
|
|
"return": [
|
|
{
|
|
"device": "disk",
|
|
"locked": false,
|
|
"removable": true,
|
|
"inserted": {
|
|
"iops_rd": 0,
|
|
"detect_zeroes": "off",
|
|
"image": {
|
|
"virtual-size": 134217728,
|
|
"filename": "TEST_DIR/t.qcow2",
|
|
"cluster-size": 65536,
|
|
"format": "qcow2",
|
|
"actual-size": SIZE,
|
|
"format-specific": {
|
|
"type": "qcow2",
|
|
"data": {
|
|
"compat": "1.1",
|
|
"lazy-refcounts": false,
|
|
"refcount-bits": 16,
|
|
"corrupt": false
|
|
}
|
|
},
|
|
"dirty-flag": false
|
|
},
|
|
"iops_wr": 0,
|
|
"ro": false,
|
|
"node-name": "NODE_NAME",
|
|
"backing_file_depth": 0,
|
|
"drv": "qcow2",
|
|
"iops": 0,
|
|
"bps_wr": 0,
|
|
"write_threshold": 0,
|
|
"encrypted": false,
|
|
"bps": 0,
|
|
"bps_rd": 0,
|
|
"cache": {
|
|
"no-flush": false,
|
|
"direct": false,
|
|
"writeback": true
|
|
},
|
|
"file": "TEST_DIR/t.qcow2",
|
|
"encryption_key_missing": false
|
|
},
|
|
"type": "unknown"
|
|
}
|
|
]
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": [
|
|
]
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
|
|
=== blockdev_add/device_add and device_del ===
|
|
|
|
Testing:
|
|
{
|
|
QMP_VERSION
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": [
|
|
{
|
|
"device": "disk",
|
|
"locked": false,
|
|
"removable": true,
|
|
"inserted": {
|
|
"iops_rd": 0,
|
|
"detect_zeroes": "off",
|
|
"image": {
|
|
"virtual-size": 134217728,
|
|
"filename": "TEST_DIR/t.qcow2",
|
|
"cluster-size": 65536,
|
|
"format": "qcow2",
|
|
"actual-size": SIZE,
|
|
"format-specific": {
|
|
"type": "qcow2",
|
|
"data": {
|
|
"compat": "1.1",
|
|
"lazy-refcounts": false,
|
|
"refcount-bits": 16,
|
|
"corrupt": false
|
|
}
|
|
},
|
|
"dirty-flag": false
|
|
},
|
|
"iops_wr": 0,
|
|
"ro": false,
|
|
"node-name": "NODE_NAME",
|
|
"backing_file_depth": 0,
|
|
"drv": "qcow2",
|
|
"iops": 0,
|
|
"bps_wr": 0,
|
|
"write_threshold": 0,
|
|
"encrypted": false,
|
|
"bps": 0,
|
|
"bps_rd": 0,
|
|
"cache": {
|
|
"no-flush": false,
|
|
"direct": false,
|
|
"writeback": true
|
|
},
|
|
"file": "TEST_DIR/t.qcow2",
|
|
"encryption_key_missing": false
|
|
},
|
|
"type": "unknown"
|
|
}
|
|
]
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": [
|
|
{
|
|
"io-status": "ok",
|
|
"device": "disk",
|
|
"locked": false,
|
|
"removable": true,
|
|
"inserted": {
|
|
"iops_rd": 0,
|
|
"detect_zeroes": "off",
|
|
"image": {
|
|
"virtual-size": 134217728,
|
|
"filename": "TEST_DIR/t.qcow2",
|
|
"cluster-size": 65536,
|
|
"format": "qcow2",
|
|
"actual-size": SIZE,
|
|
"format-specific": {
|
|
"type": "qcow2",
|
|
"data": {
|
|
"compat": "1.1",
|
|
"lazy-refcounts": false,
|
|
"refcount-bits": 16,
|
|
"corrupt": false
|
|
}
|
|
},
|
|
"dirty-flag": false
|
|
},
|
|
"iops_wr": 0,
|
|
"ro": false,
|
|
"node-name": "NODE_NAME",
|
|
"backing_file_depth": 0,
|
|
"drv": "qcow2",
|
|
"iops": 0,
|
|
"bps_wr": 0,
|
|
"write_threshold": 0,
|
|
"encrypted": false,
|
|
"bps": 0,
|
|
"bps_rd": 0,
|
|
"cache": {
|
|
"no-flush": false,
|
|
"direct": false,
|
|
"writeback": true
|
|
},
|
|
"file": "TEST_DIR/t.qcow2",
|
|
"encryption_key_missing": false
|
|
},
|
|
"type": "unknown"
|
|
}
|
|
]
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
*** done
|