[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 for-2.12 04/25] iotests: Drop explicit base block
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v7 for-2.12 04/25] iotests: Drop explicit base blockdev in 191 |
Date: |
Mon, 20 Nov 2017 21:09:43 +0100 |
Overriding the backing image should result in a json:{} pseudo-filename.
Then, you can no longer use the commit block job with filename
parameters. Therefore, do not explicitly add the base and override the
middle image in iotest 191, since we do not need to anyway. This will
allow us to continue to use the middle image's filename to identify it.
In the long run, we want block-commit to accept node names for base and
top (just like block-stream does).
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/191 | 3 +-
tests/qemu-iotests/191.out | 70 +++++++++++++++++++++++-----------------------
2 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index ad785e10b1..92805e9ca2 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -67,8 +67,7 @@ qemu_comm_method="qmp"
qmp_pretty="y"
_launch_qemu \
- -blockdev
"driver=${IMGFMT},file.driver=file,file.filename=${TEST_IMG}.base,node-name=base"
\
- -blockdev
"driver=${IMGFMT},file.driver=file,file.filename=${TEST_IMG}.mid,node-name=mid,backing=base"
\
+ -blockdev
"driver=${IMGFMT},file.driver=file,file.filename=${TEST_IMG}.mid,node-name=mid"
\
-blockdev
"driver=${IMGFMT},file.driver=file,file.filename=${TEST_IMG},node-name=top,backing=mid"
\
-blockdev
"driver=${IMGFMT},file.driver=file,file.filename=${TEST_IMG}.ovl2,node-name=top2,backing=mid"
h=$QEMU_HANDLE
diff --git a/tests/qemu-iotests/191.out b/tests/qemu-iotests/191.out
index 73c0ed454c..26ff0a315d 100644
--- a/tests/qemu-iotests/191.out
+++ b/tests/qemu-iotests/191.out
@@ -220,26 +220,8 @@ wrote 65536/65536 bytes at offset 1048576
"iops_rd": 0,
"detect_zeroes": "off",
"image": {
- "backing-image": {
- "virtual-size": 67108864,
- "filename": "TEST_DIR/t.qcow2.base",
- "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
- },
- "backing-filename-format": "qcow2",
"virtual-size": 67108864,
- "filename": "TEST_DIR/t.qcow2.mid",
+ "filename": "TEST_DIR/t.qcow2.base",
"cluster-size": 65536,
"format": "qcow2",
"actual-size": SIZE,
@@ -252,19 +234,16 @@ wrote 65536/65536 bytes at offset 1048576
"corrupt": false
}
},
- "full-backing-filename": "TEST_DIR/t.qcow2.base",
- "backing-filename": "TEST_DIR/t.qcow2.base",
"dirty-flag": false
},
"iops_wr": 0,
- "ro": false,
- "node-name": "mid",
- "backing_file_depth": 1,
+ "ro": true,
+ "node-name": "NODE_NAME",
+ "backing_file_depth": 0,
"drv": "qcow2",
"iops": 0,
"bps_wr": 0,
"write_threshold": 0,
- "backing_file": "TEST_DIR/t.qcow2.base",
"encrypted": false,
"bps": 0,
"bps_rd": 0,
@@ -273,7 +252,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.qcow2.mid",
+ "file": "TEST_DIR/t.qcow2.base",
"encryption_key_missing": false
},
{
@@ -281,13 +260,13 @@ wrote 65536/65536 bytes at offset 1048576
"detect_zeroes": "off",
"image": {
"virtual-size": 393216,
- "filename": "TEST_DIR/t.qcow2.mid",
+ "filename": "TEST_DIR/t.qcow2.base",
"format": "file",
"actual-size": SIZE,
"dirty-flag": false
},
"iops_wr": 0,
- "ro": false,
+ "ro": true,
"node-name": "NODE_NAME",
"backing_file_depth": 0,
"drv": "file",
@@ -302,15 +281,33 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.qcow2.mid",
+ "file": "TEST_DIR/t.qcow2.base",
"encryption_key_missing": false
},
{
"iops_rd": 0,
"detect_zeroes": "off",
"image": {
+ "backing-image": {
+ "virtual-size": 67108864,
+ "filename": "TEST_DIR/t.qcow2.base",
+ "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
+ },
+ "backing-filename-format": "qcow2",
"virtual-size": 67108864,
- "filename": "TEST_DIR/t.qcow2.base",
+ "filename": "TEST_DIR/t.qcow2.mid",
"cluster-size": 65536,
"format": "qcow2",
"actual-size": SIZE,
@@ -323,16 +320,19 @@ wrote 65536/65536 bytes at offset 1048576
"corrupt": false
}
},
+ "full-backing-filename": "TEST_DIR/t.qcow2.base",
+ "backing-filename": "TEST_DIR/t.qcow2.base",
"dirty-flag": false
},
"iops_wr": 0,
"ro": false,
- "node-name": "base",
- "backing_file_depth": 0,
+ "node-name": "mid",
+ "backing_file_depth": 1,
"drv": "qcow2",
"iops": 0,
"bps_wr": 0,
"write_threshold": 0,
+ "backing_file": "TEST_DIR/t.qcow2.base",
"encrypted": false,
"bps": 0,
"bps_rd": 0,
@@ -341,7 +341,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.qcow2.base",
+ "file": "TEST_DIR/t.qcow2.mid",
"encryption_key_missing": false
},
{
@@ -349,7 +349,7 @@ wrote 65536/65536 bytes at offset 1048576
"detect_zeroes": "off",
"image": {
"virtual-size": 393216,
- "filename": "TEST_DIR/t.qcow2.base",
+ "filename": "TEST_DIR/t.qcow2.mid",
"format": "file",
"actual-size": SIZE,
"dirty-flag": false
@@ -370,7 +370,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.qcow2.base",
+ "file": "TEST_DIR/t.qcow2.mid",
"encryption_key_missing": false
}
]
--
2.13.6
- [Qemu-devel] [PATCH v7 for-2.12 00/25] block: Fix some filename generation issues, Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 01/25] block/mirror: Small absolute-paths simplification, Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 02/25] block: Use children list in bdrv_refresh_filename, Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 03/25] block: Add BDS.backing_overridden, Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 04/25] iotests: Drop explicit base blockdev in 191,
Max Reitz <=
- [Qemu-devel] [PATCH v7 for-2.12 05/25] block: Respect backing bs in bdrv_refresh_filename, Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 06/25] block: Make path_combine() return the path, Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 07/25] block: bdrv_get_full_backing_filename_from_...'s ret. val., Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 08/25] block: bdrv_get_full_backing_filename's ret. val., Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 09/25] block: Add bdrv_make_absolute_filename(), Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 10/25] block: Fix bdrv_find_backing_image(), Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 11/25] block: Add bdrv_dirname(), Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 12/25] blkverify: Make bdrv_dirname() return NULL, Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 13/25] quorum: Make bdrv_dirname() return NULL, Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 14/25] block/nbd: Make bdrv_dirname() return NULL, Max Reitz, 2017/11/20