[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 23/33] qemu-iotests/067: Avoid blockdev-add with id
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 23/33] qemu-iotests/067: Avoid blockdev-add with id |
Date: |
Thu, 22 Sep 2016 18:29:24 +0200 |
We want to remove the 'id' option for blockdev-add. This removes one
user of the option and makes it use only node names.
In order to keep the test meaningful, some instances of query-block that
want to check whether the node still exists and would now turn up empty
must be converted to query-named-block-nodes (which also return the
protocol level node, but that shouldn't hurt).
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
tests/qemu-iotests/067 | 6 +-
tests/qemu-iotests/067.out | 211 +++++++++++++++++++++++++++------------------
2 files changed, 131 insertions(+), 86 deletions(-)
diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
index c1df48e..a12125b 100755
--- a/tests/qemu-iotests/067
+++ b/tests/qemu-iotests/067
@@ -121,7 +121,7 @@ run_qemu <<EOF
"arguments": {
"options": {
"driver": "$IMGFMT",
- "id": "disk",
+ "node-name": "disk",
"file": {
"driver": "file",
"filename": "$TEST_IMG"
@@ -129,13 +129,13 @@ run_qemu <<EOF
}
}
}
-{ "execute": "query-block" }
+{ "execute": "query-named-block-nodes" }
{ "execute": "device_add",
"arguments": { "driver": "virtio-blk", "drive": "disk",
"id": "virtio0" } }
{ "execute": "device_del", "arguments": { "id": "virtio0" } }
{ "execute": "system_reset" }
-{ "execute": "query-block" }
+{ "execute": "query-named-block-nodes" }
{ "execute": "quit" }
EOF
diff --git a/tests/qemu-iotests/067.out b/tests/qemu-iotests/067.out
index 7e25a49..782eae2 100644
--- a/tests/qemu-iotests/067.out
+++ b/tests/qemu-iotests/067.out
@@ -258,49 +258,72 @@ Testing:
{
"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
+ "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
+ }
},
- "file": "TEST_DIR/t.qcow2",
- "encryption_key_missing": false
+ "dirty-flag": false
},
- "type": "unknown"
+ "iops_wr": 0,
+ "ro": false,
+ "node-name": "disk",
+ "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
+ },
+ {
+ "iops_rd": 0,
+ "detect_zeroes": "off",
+ "image": {
+ "virtual-size": 197120,
+ "filename": "TEST_DIR/t.qcow2",
+ "format": "file",
+ "actual-size": SIZE,
+ "dirty-flag": false
+ },
+ "iops_wr": 0,
+ "ro": false,
+ "node-name": "NODE_NAME",
+ "backing_file_depth": 0,
+ "drv": "file",
+ "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
}
]
}
@@ -319,50 +342,72 @@ Testing:
{
"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_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
+ }
},
- "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
+ "dirty-flag": false
},
- "type": "unknown"
+ "iops_wr": 0,
+ "ro": false,
+ "node-name": "disk",
+ "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
+ },
+ {
+ "iops_rd": 0,
+ "detect_zeroes": "off",
+ "image": {
+ "virtual-size": 197120,
+ "filename": "TEST_DIR/t.qcow2",
+ "format": "file",
+ "actual-size": SIZE,
+ "dirty-flag": false
+ },
+ "iops_wr": 0,
+ "ro": false,
+ "node-name": "NODE_NAME",
+ "backing_file_depth": 0,
+ "drv": "file",
+ "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
}
]
}
--
1.8.3.1
- [Qemu-devel] [PULL 13/33] qdev-monitor: Factor out find_device_state(), (continued)
- [Qemu-devel] [PULL 13/33] qdev-monitor: Factor out find_device_state(), Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 12/33] block: Add blk_by_dev(), Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 14/33] qdev-monitor: Add blk_by_qdev_id(), Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 16/33] block: Accept device model name for x-blockdev-insert-medium, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 15/33] block: Accept device model name for blockdev-open/close-tray, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 17/33] block: Accept device model name for x-blockdev-remove-medium, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 18/33] block: Accept device model name for eject, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 19/33] block: Accept device model name for blockdev-change-medium, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 21/33] qemu-iotests/118: Test media change with qdev name, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 25/33] qemu-iotests/081: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 23/33] qemu-iotests/067: Avoid blockdev-add with id,
Kevin Wolf <=
- [Qemu-devel] [PULL 22/33] qemu-iotests/041: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 20/33] block: Accept device model name for block_set_io_throttle, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 26/33] qemu-iotests/087: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 24/33] qemu-iotests/071: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 27/33] qemu-iotests/117: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 28/33] qemu-iotests/118: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 29/33] qemu-iotests/124: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 32/33] qemu-iotests/141: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 33/33] block: Remove BB interface from blockdev-add/del, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 30/33] qemu-iotests/139: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22