[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v8 04/26] iotests: Drop explicit base blockdev in 19
|
From: |
Max Reitz |
|
Subject: |
[Qemu-block] [PATCH v8 04/26] iotests: Drop explicit base blockdev in 191 |
|
Date: |
Mon, 5 Feb 2018 16:18:13 +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 | 52 +++++++++++++++++++++++-----------------------
2 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index dfad6555e4..af93e932bf 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -66,8 +66,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 190c5f049a..575cd3ea2d 100644
--- a/tests/qemu-iotests/191.out
+++ b/tests/qemu-iotests/191.out
@@ -184,33 +184,21 @@ wrote 65536/65536 bytes at offset 1048576
"iops_rd": 0,
"detect_zeroes": "off",
"image": {
- "backing-image": {
- "virtual-size": 67108864,
- "filename": "TEST_DIR/t.IMGFMT.base",
- "cluster-size": 65536,
- "format": "IMGFMT",
- "actual-size": SIZE,
- "dirty-flag": false
- },
- "backing-filename-format": "IMGFMT",
"virtual-size": 67108864,
- "filename": "TEST_DIR/t.IMGFMT.mid",
+ "filename": "TEST_DIR/t.IMGFMT.base",
"cluster-size": 65536,
"format": "IMGFMT",
"actual-size": SIZE,
- "full-backing-filename": "TEST_DIR/t.IMGFMT.base",
- "backing-filename": "TEST_DIR/t.IMGFMT.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": "IMGFMT",
"iops": 0,
"bps_wr": 0,
"write_threshold": 0,
- "backing_file": "TEST_DIR/t.IMGFMT.base",
"encrypted": false,
"bps": 0,
"bps_rd": 0,
@@ -219,7 +207,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.mid",
+ "file": "TEST_DIR/t.IMGFMT.base",
"encryption_key_missing": false
},
{
@@ -227,13 +215,13 @@ wrote 65536/65536 bytes at offset 1048576
"detect_zeroes": "off",
"image": {
"virtual-size": 393216,
- "filename": "TEST_DIR/t.IMGFMT.mid",
+ "filename": "TEST_DIR/t.IMGFMT.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",
@@ -248,28 +236,40 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.mid",
+ "file": "TEST_DIR/t.IMGFMT.base",
"encryption_key_missing": false
},
{
"iops_rd": 0,
"detect_zeroes": "off",
"image": {
+ "backing-image": {
+ "virtual-size": 67108864,
+ "filename": "TEST_DIR/t.IMGFMT.base",
+ "cluster-size": 65536,
+ "format": "IMGFMT",
+ "actual-size": SIZE,
+ "dirty-flag": false
+ },
+ "backing-filename-format": "IMGFMT",
"virtual-size": 67108864,
- "filename": "TEST_DIR/t.IMGFMT.base",
+ "filename": "TEST_DIR/t.IMGFMT.mid",
"cluster-size": 65536,
"format": "IMGFMT",
"actual-size": SIZE,
+ "full-backing-filename": "TEST_DIR/t.IMGFMT.base",
+ "backing-filename": "TEST_DIR/t.IMGFMT.base",
"dirty-flag": false
},
"iops_wr": 0,
"ro": false,
- "node-name": "base",
- "backing_file_depth": 0,
+ "node-name": "mid",
+ "backing_file_depth": 1,
"drv": "IMGFMT",
"iops": 0,
"bps_wr": 0,
"write_threshold": 0,
+ "backing_file": "TEST_DIR/t.IMGFMT.base",
"encrypted": false,
"bps": 0,
"bps_rd": 0,
@@ -278,7 +278,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.base",
+ "file": "TEST_DIR/t.IMGFMT.mid",
"encryption_key_missing": false
},
{
@@ -286,7 +286,7 @@ wrote 65536/65536 bytes at offset 1048576
"detect_zeroes": "off",
"image": {
"virtual-size": 393216,
- "filename": "TEST_DIR/t.IMGFMT.base",
+ "filename": "TEST_DIR/t.IMGFMT.mid",
"format": "file",
"actual-size": SIZE,
"dirty-flag": false
@@ -307,7 +307,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.IMGFMT.base",
+ "file": "TEST_DIR/t.IMGFMT.mid",
"encryption_key_missing": false
}
]
--
2.14.3
- Re: [Qemu-block] [PATCH v8 01/26] block/mirror: Small absolute-paths simplification, (continued)
- [Qemu-block] [PATCH v8 02/26] block: Use children list in bdrv_refresh_filename, Max Reitz, 2018/02/05
- [Qemu-block] [PATCH v8 03/26] block: Add BDS.backing_overridden, Max Reitz, 2018/02/05
- Re: [Qemu-block] [PATCH v8 03/26] block: Add BDS.backing_overridden, Kevin Wolf, 2018/02/22
- Re: [Qemu-block] [PATCH v8 03/26] block: Add BDS.backing_overridden, Max Reitz, 2018/02/22
- Re: [Qemu-block] [PATCH v8 03/26] block: Add BDS.backing_overridden, Kevin Wolf, 2018/02/22
- Re: [Qemu-block] [PATCH v8 03/26] block: Add BDS.backing_overridden, Max Reitz, 2018/02/22
- Re: [Qemu-block] [PATCH v8 03/26] block: Add BDS.backing_overridden, Kevin Wolf, 2018/02/22
- Re: [Qemu-block] [PATCH v8 03/26] block: Add BDS.backing_overridden, Max Reitz, 2018/02/22
[Qemu-block] [PATCH v8 04/26] iotests: Drop explicit base blockdev in 191,
Max Reitz <=
[Qemu-block] [PATCH v8 05/26] block: Respect backing bs in bdrv_refresh_filename, Max Reitz, 2018/02/05
[Qemu-block] [PATCH v8 06/26] block: Make path_combine() return the path, Max Reitz, 2018/02/05
[Qemu-block] [PATCH v8 07/26] block: bdrv_get_full_backing_filename_from_...'s ret. val., Max Reitz, 2018/02/05
[Qemu-block] [PATCH v8 08/26] block: bdrv_get_full_backing_filename's ret. val., Max Reitz, 2018/02/05
[Qemu-block] [PATCH v8 09/26] block: Add bdrv_make_absolute_filename(), Max Reitz, 2018/02/05