Skip to content

Q
qemu

openeuler / qemu

通知 10
Star 0
Fork 0
Q
qemu

体验新版 GitCode，发现更多精彩内容 >>

提交 e121034d 编写于 作者: M Max Reitz
浏览文件
操作

iotests: Fix 067 for compat=0.10 

067 works very well with compat=0.10 once you remove format-specific
information from the QMP output.
Signed-off-by: NMax Reitz <mreitz@redhat.com>
Message-id: 20171123020832.8165-14-mreitz@redhat.com
Reviewed-by: NJohn Snow <jsnow@redhat.com>
Signed-off-by: NMax Reitz <mreitz@redhat.com>
上级 76bf133c
隐藏空白更改
内联 并排
Showing with 28 addition and 72 deletion
tests/qemu-iotests/067
浏览文件 @ e121034d
...@@ -57,7 +57,8 @@ function run_qemu() ...@@ -57,7 +57,8 @@ function run_qemu()
{ {
do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp | _filter_qemu \ do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp | _filter_qemu \
| _filter_actual_image_size \ | _filter_actual_image_size \
| _filter_generated_node_ids | _filter_qmp_events | _filter_generated_node_ids | _filter_qmp_events \
| _filter_img_info
} }
size=128M size=128M
......
tests/qemu-iotests/067.out
浏览文件 @ e121034d
...@@ -3,7 +3,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 ...@@ -3,7 +3,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
=== -drive/-device and device_del === === -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 QMP_VERSION
} }
...@@ -23,26 +23,17 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virti ...@@ -23,26 +23,17 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virti
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"virtual-size": 134217728, "virtual-size": 134217728,
"filename": "TEST_DIR/t.qcow2", "filename": "TEST_DIR/t.IMGFMT",
"cluster-size": 65536, "cluster-size": 65536,
"format": "qcow2", "format": "IMGFMT",
"actual-size": SIZE, "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"refcount-bits": 16,
"corrupt": false
}
},
"dirty-flag": false "dirty-flag": false
}, },
"iops_wr": 0, "iops_wr": 0,
"ro": false, "ro": false,
"node-name": "NODE_NAME", "node-name": "NODE_NAME",
"backing_file_depth": 0, "backing_file_depth": 0,
"drv": "qcow2", "drv": "IMGFMT",
"iops": 0, "iops": 0,
"bps_wr": 0, "bps_wr": 0,
"write_threshold": 0, "write_threshold": 0,
...@@ -54,7 +45,7 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virti ...@@ -54,7 +45,7 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virti
"direct": false, "direct": false,
"writeback": true "writeback": true
}, },
"file": "TEST_DIR/t.qcow2", "file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false "encryption_key_missing": false
}, },
"qdev": "/machine/peripheral/virtio0/virtio-backend", "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 ...@@ -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 === === -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 QMP_VERSION
} }
...@@ -100,26 +91,17 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk ...@@ -100,26 +91,17 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"virtual-size": 134217728, "virtual-size": 134217728,
"filename": "TEST_DIR/t.qcow2", "filename": "TEST_DIR/t.IMGFMT",
"cluster-size": 65536, "cluster-size": 65536,
"format": "qcow2", "format": "IMGFMT",
"actual-size": SIZE, "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"refcount-bits": 16,
"corrupt": false
}
},
"dirty-flag": false "dirty-flag": false
}, },
"iops_wr": 0, "iops_wr": 0,
"ro": false, "ro": false,
"node-name": "NODE_NAME", "node-name": "NODE_NAME",
"backing_file_depth": 0, "backing_file_depth": 0,
"drv": "qcow2", "drv": "IMGFMT",
"iops": 0, "iops": 0,
"bps_wr": 0, "bps_wr": 0,
"write_threshold": 0, "write_threshold": 0,
...@@ -131,7 +113,7 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk ...@@ -131,7 +113,7 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk
"direct": false, "direct": false,
"writeback": true "writeback": true
}, },
"file": "TEST_DIR/t.qcow2", "file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false "encryption_key_missing": false
}, },
"type": "unknown" "type": "unknown"
...@@ -183,26 +165,17 @@ Testing: ...@@ -183,26 +165,17 @@ Testing:
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"virtual-size": 134217728, "virtual-size": 134217728,
"filename": "TEST_DIR/t.qcow2", "filename": "TEST_DIR/t.IMGFMT",
"cluster-size": 65536, "cluster-size": 65536,
"format": "qcow2", "format": "IMGFMT",
"actual-size": SIZE, "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"refcount-bits": 16,
"corrupt": false
}
},
"dirty-flag": false "dirty-flag": false
}, },
"iops_wr": 0, "iops_wr": 0,
"ro": false, "ro": false,
"node-name": "NODE_NAME", "node-name": "NODE_NAME",
"backing_file_depth": 0, "backing_file_depth": 0,
"drv": "qcow2", "drv": "IMGFMT",
"iops": 0, "iops": 0,
"bps_wr": 0, "bps_wr": 0,
"write_threshold": 0, "write_threshold": 0,
...@@ -214,7 +187,7 @@ Testing: ...@@ -214,7 +187,7 @@ Testing:
"direct": false, "direct": false,
"writeback": true "writeback": true
}, },
"file": "TEST_DIR/t.qcow2", "file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false "encryption_key_missing": false
}, },
"type": "unknown" "type": "unknown"
...@@ -263,26 +236,17 @@ Testing: ...@@ -263,26 +236,17 @@ Testing:
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"virtual-size": 134217728, "virtual-size": 134217728,
"filename": "TEST_DIR/t.qcow2", "filename": "TEST_DIR/t.IMGFMT",
"cluster-size": 65536, "cluster-size": 65536,
"format": "qcow2", "format": "IMGFMT",
"actual-size": SIZE, "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"refcount-bits": 16,
"corrupt": false
}
},
"dirty-flag": false "dirty-flag": false
}, },
"iops_wr": 0, "iops_wr": 0,
"ro": false, "ro": false,
"node-name": "disk", "node-name": "disk",
"backing_file_depth": 0, "backing_file_depth": 0,
"drv": "qcow2", "drv": "IMGFMT",
"iops": 0, "iops": 0,
"bps_wr": 0, "bps_wr": 0,
"write_threshold": 0, "write_threshold": 0,
...@@ -294,7 +258,7 @@ Testing: ...@@ -294,7 +258,7 @@ Testing:
"direct": false, "direct": false,
"writeback": true "writeback": true
}, },
"file": "TEST_DIR/t.qcow2", "file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false "encryption_key_missing": false
}, },
{ {
...@@ -302,7 +266,7 @@ Testing: ...@@ -302,7 +266,7 @@ Testing:
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"virtual-size": 197120, "virtual-size": 197120,
"filename": "TEST_DIR/t.qcow2", "filename": "TEST_DIR/t.IMGFMT",
"format": "file", "format": "file",
"actual-size": SIZE, "actual-size": SIZE,
"dirty-flag": false "dirty-flag": false
...@@ -323,7 +287,7 @@ Testing: ...@@ -323,7 +287,7 @@ Testing:
"direct": false, "direct": false,
"writeback": true "writeback": true
}, },
"file": "TEST_DIR/t.qcow2", "file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false "encryption_key_missing": false
} }
] ]
...@@ -347,26 +311,17 @@ Testing: ...@@ -347,26 +311,17 @@ Testing:
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"virtual-size": 134217728, "virtual-size": 134217728,
"filename": "TEST_DIR/t.qcow2", "filename": "TEST_DIR/t.IMGFMT",
"cluster-size": 65536, "cluster-size": 65536,
"format": "qcow2", "format": "IMGFMT",
"actual-size": SIZE, "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"refcount-bits": 16,
"corrupt": false
}
},
"dirty-flag": false "dirty-flag": false
}, },
"iops_wr": 0, "iops_wr": 0,
"ro": false, "ro": false,
"node-name": "disk", "node-name": "disk",
"backing_file_depth": 0, "backing_file_depth": 0,
"drv": "qcow2", "drv": "IMGFMT",
"iops": 0, "iops": 0,
"bps_wr": 0, "bps_wr": 0,
"write_threshold": 0, "write_threshold": 0,
...@@ -378,7 +333,7 @@ Testing: ...@@ -378,7 +333,7 @@ Testing:
"direct": false, "direct": false,
"writeback": true "writeback": true
}, },
"file": "TEST_DIR/t.qcow2", "file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false "encryption_key_missing": false
}, },
{ {
...@@ -386,7 +341,7 @@ Testing: ...@@ -386,7 +341,7 @@ Testing:
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"virtual-size": 197120, "virtual-size": 197120,
"filename": "TEST_DIR/t.qcow2", "filename": "TEST_DIR/t.IMGFMT",
"format": "file", "format": "file",
"actual-size": SIZE, "actual-size": SIZE,
"dirty-flag": false "dirty-flag": false
...@@ -407,7 +362,7 @@ Testing: ...@@ -407,7 +362,7 @@ Testing:
"direct": false, "direct": false,
"writeback": true "writeback": true
}, },
"file": "TEST_DIR/t.qcow2", "file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false "encryption_key_missing": false
} }
] ]
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或