[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 22/29] iotests: Fix 067 for compat=0.10
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 22/29] iotests: Fix 067 for compat=0.10 |
Date: |
Tue, 23 Jan 2018 15:01:54 +0100 |
From: Max Reitz <address@hidden>
067 works very well with compat=0.10 once you remove format-specific
information from the QMP output.
Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/067 | 3 +-
tests/qemu-iotests/067.out | 97 +++++++++++++---------------------------------
2 files changed, 28 insertions(+), 72 deletions(-)
diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
index 9d561ef786..fe259f6165 100755
--- a/tests/qemu-iotests/067
+++ b/tests/qemu-iotests/067
@@ -57,7 +57,8 @@ function run_qemu()
{
do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp | _filter_qemu \
| _filter_actual_image_size \
- | _filter_generated_node_ids | _filter_qmp_events
+ | _filter_generated_node_ids | _filter_qmp_events \
+ | _filter_img_info
}
size=128M
diff --git a/tests/qemu-iotests/067.out b/tests/qemu-iotests/067.out
index 58e83c4505..2e71cff3ce 100644
--- a/tests/qemu-iotests/067.out
+++ b/tests/qemu-iotests/067.out
@@ -3,7 +3,7 @@ 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
+Testing: -drive file=TEST_DIR/t.IMGFMT,format=IMGFMT,if=none,id=disk -device
virtio-blk,drive=disk,id=virtio0
{
QMP_VERSION
}
@@ -23,26 +23,17 @@ Testing: -drive
file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virti
"detect_zeroes": "off",
"image": {
"virtual-size": 134217728,
- "filename": "TEST_DIR/t.qcow2",
+ "filename": "TEST_DIR/t.IMGFMT",
"cluster-size": 65536,
- "format": "qcow2",
+ "format": "IMGFMT",
"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",
+ "drv": "IMGFMT",
"iops": 0,
"bps_wr": 0,
"write_threshold": 0,
@@ -54,7 +45,7 @@ Testing: -drive
file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virti
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.qcow2",
+ "file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
},
"qdev": "/machine/peripheral/virtio0/virtio-backend",
@@ -81,7 +72,7 @@ Testing: -drive
file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virti
=== -drive/device_add and device_del ===
-Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk
+Testing: -drive file=TEST_DIR/t.IMGFMT,format=IMGFMT,if=none,id=disk
{
QMP_VERSION
}
@@ -100,26 +91,17 @@ Testing: -drive
file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk
"detect_zeroes": "off",
"image": {
"virtual-size": 134217728,
- "filename": "TEST_DIR/t.qcow2",
+ "filename": "TEST_DIR/t.IMGFMT",
"cluster-size": 65536,
- "format": "qcow2",
+ "format": "IMGFMT",
"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",
+ "drv": "IMGFMT",
"iops": 0,
"bps_wr": 0,
"write_threshold": 0,
@@ -131,7 +113,7 @@ Testing: -drive
file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.qcow2",
+ "file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
},
"type": "unknown"
@@ -183,26 +165,17 @@ Testing:
"detect_zeroes": "off",
"image": {
"virtual-size": 134217728,
- "filename": "TEST_DIR/t.qcow2",
+ "filename": "TEST_DIR/t.IMGFMT",
"cluster-size": 65536,
- "format": "qcow2",
+ "format": "IMGFMT",
"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",
+ "drv": "IMGFMT",
"iops": 0,
"bps_wr": 0,
"write_threshold": 0,
@@ -214,7 +187,7 @@ Testing:
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.qcow2",
+ "file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
},
"type": "unknown"
@@ -263,26 +236,17 @@ Testing:
"detect_zeroes": "off",
"image": {
"virtual-size": 134217728,
- "filename": "TEST_DIR/t.qcow2",
+ "filename": "TEST_DIR/t.IMGFMT",
"cluster-size": 65536,
- "format": "qcow2",
+ "format": "IMGFMT",
"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": "disk",
"backing_file_depth": 0,
- "drv": "qcow2",
+ "drv": "IMGFMT",
"iops": 0,
"bps_wr": 0,
"write_threshold": 0,
@@ -294,7 +258,7 @@ Testing:
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.qcow2",
+ "file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
},
{
@@ -302,7 +266,7 @@ Testing:
"detect_zeroes": "off",
"image": {
"virtual-size": 197120,
- "filename": "TEST_DIR/t.qcow2",
+ "filename": "TEST_DIR/t.IMGFMT",
"format": "file",
"actual-size": SIZE,
"dirty-flag": false
@@ -323,7 +287,7 @@ Testing:
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.qcow2",
+ "file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
}
]
@@ -347,26 +311,17 @@ Testing:
"detect_zeroes": "off",
"image": {
"virtual-size": 134217728,
- "filename": "TEST_DIR/t.qcow2",
+ "filename": "TEST_DIR/t.IMGFMT",
"cluster-size": 65536,
- "format": "qcow2",
+ "format": "IMGFMT",
"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": "disk",
"backing_file_depth": 0,
- "drv": "qcow2",
+ "drv": "IMGFMT",
"iops": 0,
"bps_wr": 0,
"write_threshold": 0,
@@ -378,7 +333,7 @@ Testing:
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.qcow2",
+ "file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
},
{
@@ -386,7 +341,7 @@ Testing:
"detect_zeroes": "off",
"image": {
"virtual-size": 197120,
- "filename": "TEST_DIR/t.qcow2",
+ "filename": "TEST_DIR/t.IMGFMT",
"format": "file",
"actual-size": SIZE,
"dirty-flag": false
@@ -407,7 +362,7 @@ Testing:
"direct": false,
"writeback": true
},
- "file": "TEST_DIR/t.qcow2",
+ "file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
}
]
--
2.13.6
- [Qemu-block] [PULL 16/29] iotests: Drop format-specific in _filter_img_info, (continued)
- [Qemu-block] [PULL 16/29] iotests: Drop format-specific in _filter_img_info, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 14/29] block/vmdk: Add blkdebug events, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 21/29] iotests: Fix 059's reference output, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 18/29] iotests: Skip 103 for refcount_bits=1, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 17/29] iotests: Forbid 020 for non-file protocols, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 24/29] iotests: Make 184 image-less, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 20/29] iotests: Fix 051 for compat=0.10, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 23/29] iotests: Make 089 compatible with compat=0.10, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 19/29] iotests: Fix 020 for vmdk, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 27/29] iotests: Make 059 pass on machines with little RAM, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 22/29] iotests: Fix 067 for compat=0.10,
Kevin Wolf <=
- [Qemu-block] [PULL 25/29] iotests: Make 191 work with qcow2 options, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 26/29] iotests: Filter compat-dependent info in 198, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 29/29] iotests: Disable some tests for compat=0.10, Kevin Wolf, 2018/01/23
- [Qemu-block] [PULL 28/29] iotests: Split 177 into two parts for compat=0.10, Kevin Wolf, 2018/01/23
- Re: [Qemu-block] [Qemu-devel] [PULL 00/29] Block layer patches, Peter Maydell, 2018/01/25