[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v14 11/14] iotests: 257: drop device_add
|
From: |
Vladimir Sementsov-Ogievskiy |
|
Subject: |
[PATCH v14 11/14] iotests: 257: drop device_add |
|
Date: |
Thu, 26 Sep 2019 13:26:11 +0300 |
SCSI devices are unused in test, drop them.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/257 | 8 -------
tests/qemu-iotests/257.out | 44 --------------------------------------
2 files changed, 52 deletions(-)
diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257
index 5d77202157..de8b45f094 100755
--- a/tests/qemu-iotests/257
+++ b/tests/qemu-iotests/257
@@ -325,12 +325,6 @@ def test_bitmap_sync(bsync_mode, msync_mode='bitmap',
failure=None):
node_name=drive0.node,
driver=drive0.fmt,
file=file_config)
- # Use share-rw to allow writes directly to the node;
- # The anonymous block-backend for this configuration prevents us
- # from using HMP's qemu-io commands to address the device.
- vm.qmp_log("device_add", id='device0',
- drive=drive0.node, driver="scsi-hd",
- share_rw=True)
log('')
# 0 - Writes and Reference Backup
@@ -467,8 +461,6 @@ def test_backup_api():
node_name=drive0.node,
driver=drive0.fmt,
file=file_config)
- vm.qmp_log("device_add", id='device0',
- drive=drive0.node, driver="scsi-hd")
log('')
target0 = Drive(backup_path, vm=vm)
diff --git a/tests/qemu-iotests/257.out b/tests/qemu-iotests/257.out
index c9b4b68232..ec7e25877b 100644
--- a/tests/qemu-iotests/257.out
+++ b/tests/qemu-iotests/257.out
@@ -5,8 +5,6 @@
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -267,8 +265,6 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2"
==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "blkdebug", "image": {"driver": "file", "filename":
"TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio",
"immediately": false, "once": true, "state": 3}], "set-state": [{"event":
"flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio",
"new-state": 3, "state": 2}]}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -480,8 +476,6 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2"
==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -742,8 +736,6 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2"
==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -1004,8 +996,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "blkdebug", "image": {"driver": "file", "filename":
"TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio",
"immediately": false, "once": true, "state": 3}], "set-state": [{"event":
"flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio",
"new-state": 3, "state": 2}]}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -1217,8 +1207,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -1479,8 +1467,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -1741,8 +1727,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "blkdebug", "image": {"driver": "file", "filename":
"TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio",
"immediately": false, "once": true, "state": 3}], "set-state": [{"event":
"flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio",
"new-state": 3, "state": 2}]}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -1954,8 +1938,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -2216,8 +2198,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -2478,8 +2458,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "blkdebug", "image": {"driver": "file", "filename":
"TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio",
"immediately": false, "once": true, "state": 3}], "set-state": [{"event":
"flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio",
"new-state": 3, "state": 2}]}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -2691,8 +2669,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -2953,8 +2929,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -3215,8 +3189,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "blkdebug", "image": {"driver": "file", "filename":
"TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio",
"immediately": false, "once": true, "state": 3}], "set-state": [{"event":
"flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio",
"new-state": 3, "state": 2}]}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -3428,8 +3400,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -3690,8 +3660,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -3952,8 +3920,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "blkdebug", "image": {"driver": "file", "filename":
"TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio",
"immediately": false, "once": true, "state": 3}], "set-state": [{"event":
"flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio",
"new-state": 3, "state": 2}]}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -4165,8 +4131,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -4427,8 +4391,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -4689,8 +4651,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "blkdebug", "image": {"driver": "file", "filename":
"TEST_DIR/PID-img"}, "inject-error": [{"errno": 5, "event": "read_aio",
"immediately": false, "once": true, "state": 3}], "set-state": [{"event":
"flush_to_disk", "new-state": 2, "state": 1}, {"event": "read_aio",
"new-state": 3, "state": 2}]}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -4902,8 +4862,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0", "share-rw": true}}
-{"return": {}}
--- Write #0 ---
@@ -5164,8 +5122,6 @@ qemu_img compare "TEST_DIR/PID-img"
"TEST_DIR/PID-fbackup2" ==> Identical, OK!
{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file":
{"driver": "file", "filename": "TEST_DIR/PID-img"}, "node-name": "drive0"}}
{"return": {}}
-{"execute": "device_add", "arguments": {"drive": "drive0", "driver":
"scsi-hd", "id": "device0"}}
-{"return": {}}
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
--
2.21.0
- [PATCH v14 00/14] backup-top filter driver for backup, Vladimir Sementsov-Ogievskiy, 2019/09/26
- [PATCH v14 04/14] block/backup: improve comment about image fleecing, Vladimir Sementsov-Ogievskiy, 2019/09/26
- [PATCH v14 01/14] block/backup: fix max_transfer handling for copy_range, Vladimir Sementsov-Ogievskiy, 2019/09/26
- [PATCH v14 06/14] block/backup: fix block-comment style, Vladimir Sementsov-Ogievskiy, 2019/09/26
- [PATCH v14 10/14] iotests: 257: drop unused Drive.device field, Vladimir Sementsov-Ogievskiy, 2019/09/26
- [PATCH v14 12/14] block: move in-flight requests handling from backup to block-copy, Vladimir Sementsov-Ogievskiy, 2019/09/26
- [PATCH v14 07/14] block: move block_copy from block/backup.c to separate file, Vladimir Sementsov-Ogievskiy, 2019/09/26
- [PATCH v14 11/14] iotests: 257: drop device_add,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v14 05/14] block/backup: introduce BlockCopyState, Vladimir Sementsov-Ogievskiy, 2019/09/26
- [PATCH v14 09/14] iotests: prepare 124 and 257 bitmap querying for backup-top filter, Vladimir Sementsov-Ogievskiy, 2019/09/26
- [PATCH v14 03/14] block/backup: split shareable copying part from backup_do_cow, Vladimir Sementsov-Ogievskiy, 2019/09/26
- [PATCH v14 08/14] block: teach bdrv_debug_breakpoint skip filters with backing, Vladimir Sementsov-Ogievskiy, 2019/09/26
- [PATCH v14 13/14] block: introduce backup-top filter driver, Vladimir Sementsov-Ogievskiy, 2019/09/26
- [PATCH v14 02/14] block/backup: fix backup_cow_with_offload for last cluster, Vladimir Sementsov-Ogievskiy, 2019/09/26
- [PATCH v14 14/14] block/backup: use backup-top instead of write notifiers, Vladimir Sementsov-Ogievskiy, 2019/09/26