[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/36] qemu-iotests: Filter out actual image size in
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 02/36] qemu-iotests: Filter out actual image size in 067 |
Date: |
Thu, 7 Nov 2013 14:12:10 +0100 |
From: Max Reitz <address@hidden>
The actual size of the image file may differ depending on the Linux
kernel currently running on the host. Filtering out this value makes
this test pass in such cases.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
tests/qemu-iotests/067 | 2 +-
tests/qemu-iotests/067.out | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
index 79dc38b..d025192 100755
--- a/tests/qemu-iotests/067
+++ b/tests/qemu-iotests/067
@@ -45,7 +45,7 @@ function do_run_qemu()
function run_qemu()
{
- do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp
+ do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp | sed -e
's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g'
}
size=128M
diff --git a/tests/qemu-iotests/067.out b/tests/qemu-iotests/067.out
index 4bb9ff9..8d271cc 100644
--- a/tests/qemu-iotests/067.out
+++ b/tests/qemu-iotests/067.out
@@ -6,7 +6,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device
virtio-blk-pci,drive=disk,id=virtio0
QMP_VERSION
{"return": {}}
-{"return": [{"io-status": "ok", "device": "disk", "locked": false,
"removable": false, "inserted": {"iops_rd": 0, "image": {"virtual-size":
134217728, "filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format":
"qcow2", "actual-size": 139264, "format-specific": {"type": "qcow2", "data":
{"compat": "1.1", "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr":
0, "ro": false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr":
0, "encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false}, "type": "unknown"}, {"io-status": "ok",
"device": "ide1-cd0", "locked": false, "removable": true, "tray_open": false,
"type": "unknown"}, {"device": "floppy0", "locked": false, "removable": true,
"tray_open": false, "type": "unknown"}, {"device": "sd0", "locked": false,
"removable": true, "tray_open": false, "type": "unknown"}]}
+{"return": [{"io-status": "ok", "device": "disk", "locked": false,
"removable": false, "inserted": {"iops_rd": 0, "image": {"virtual-size":
134217728, "filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format":
"qcow2", "actual-size": SIZE, "format-specific": {"type": "qcow2", "data":
{"compat": "1.1", "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr":
0, "ro": false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr":
0, "encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false}, "type": "unknown"}, {"io-status": "ok",
"device": "ide1-cd0", "locked": false, "removable": true, "tray_open": false,
"type": "unknown"}, {"device": "floppy0", "locked": false, "removable": true,
"tray_open": false, "type": "unknown"}, {"device": "sd0", "locked": false,
"removable": true, "tray_open": false, "type": "unknown"}]}
{"return": {}}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"DEVICE_DELETED", "data": {"path":
"/machine/peripheral/virtio0/virtio-backend"}}
@@ -24,7 +24,7 @@ QMP_VERSION
Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk
QMP_VERSION
{"return": {}}
-{"return": [{"device": "disk", "locked": false, "removable": true, "inserted":
{"iops_rd": 0, "image": {"virtual-size": 134217728, "filename":
"TEST_DIR/t.qcow2", "cluster-size": 65536, "format": "qcow2", "actual-size":
139264, "format-specific": {"type": "qcow2", "data": {"compat": "1.1",
"lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": false,
"backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "encrypted":
false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false}, "tray_open": false, "type": "unknown"},
{"io-status": "ok", "device": "ide1-cd0", "locked": false, "removable": true,
"tray_open": false, "type": "unknown"}, {"device": "floppy0", "locked": false,
"removable": true, "tray_open": false, "type": "unknown"}, {"device": "sd0",
"locked": false, "removable": true, "tray_open": false, "type": "unknown"}]}
+{"return": [{"device": "disk", "locked": false, "removable": true, "inserted":
{"iops_rd": 0, "image": {"virtual-size": 134217728, "filename":
"TEST_DIR/t.qcow2", "cluster-size": 65536, "format": "qcow2", "actual-size":
SIZE, "format-specific": {"type": "qcow2", "data": {"compat": "1.1",
"lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": false,
"backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "encrypted":
false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false}, "tray_open": false, "type": "unknown"},
{"io-status": "ok", "device": "ide1-cd0", "locked": false, "removable": true,
"tray_open": false, "type": "unknown"}, {"device": "floppy0", "locked": false,
"removable": true, "tray_open": false, "type": "unknown"}, {"device": "sd0",
"locked": false, "removable": true, "tray_open": false, "type": "unknown"}]}
{"return": {}}
{"return": {}}
{"return": {}}
@@ -44,7 +44,7 @@ Testing:
QMP_VERSION
{"return": {}}
{"return": "OK\r\n"}
-{"return": [{"io-status": "ok", "device": "ide1-cd0", "locked": false,
"removable": true, "tray_open": false, "type": "unknown"}, {"device":
"floppy0", "locked": false, "removable": true, "tray_open": false, "type":
"unknown"}, {"device": "sd0", "locked": false, "removable": true, "tray_open":
false, "type": "unknown"}, {"device": "disk", "locked": false, "removable":
true, "inserted": {"iops_rd": 0, "image": {"virtual-size": 134217728,
"filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format": "qcow2",
"actual-size": 139264, "format-specific": {"type": "qcow2", "data": {"compat":
"1.1", "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr": 0, "ro":
false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0,
"encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false}, "tray_open": false, "type": "unknown"}]}
+{"return": [{"io-status": "ok", "device": "ide1-cd0", "locked": false,
"removable": true, "tray_open": false, "type": "unknown"}, {"device":
"floppy0", "locked": false, "removable": true, "tray_open": false, "type":
"unknown"}, {"device": "sd0", "locked": false, "removable": true, "tray_open":
false, "type": "unknown"}, {"device": "disk", "locked": false, "removable":
true, "inserted": {"iops_rd": 0, "image": {"virtual-size": 134217728,
"filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format": "qcow2",
"actual-size": SIZE, "format-specific": {"type": "qcow2", "data": {"compat":
"1.1", "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr": 0, "ro":
false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0,
"encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false}, "tray_open": false, "type": "unknown"}]}
{"return": {}}
{"return": {}}
{"return": {}}
@@ -64,14 +64,14 @@ Testing:
QMP_VERSION
{"return": {}}
{"return": {}}
-{"return": [{"io-status": "ok", "device": "ide1-cd0", "locked": false,
"removable": true, "tray_open": false, "type": "unknown"}, {"device":
"floppy0", "locked": false, "removable": true, "tray_open": false, "type":
"unknown"}, {"device": "sd0", "locked": false, "removable": true, "tray_open":
false, "type": "unknown"}, {"device": "disk", "locked": false, "removable":
true, "inserted": {"iops_rd": 0, "image": {"virtual-size": 134217728,
"filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format": "qcow2",
"actual-size": 139264, "format-specific": {"type": "qcow2", "data": {"compat":
"1.1", "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr": 0, "ro":
false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0,
"encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false}, "tray_open": false, "type": "unknown"}]}
+{"return": [{"io-status": "ok", "device": "ide1-cd0", "locked": false,
"removable": true, "tray_open": false, "type": "unknown"}, {"device":
"floppy0", "locked": false, "removable": true, "tray_open": false, "type":
"unknown"}, {"device": "sd0", "locked": false, "removable": true, "tray_open":
false, "type": "unknown"}, {"device": "disk", "locked": false, "removable":
true, "inserted": {"iops_rd": 0, "image": {"virtual-size": 134217728,
"filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format": "qcow2",
"actual-size": SIZE, "format-specific": {"type": "qcow2", "data": {"compat":
"1.1", "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr": 0, "ro":
false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0,
"encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false}, "tray_open": false, "type": "unknown"}]}
{"return": {}}
{"return": {}}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"DEVICE_DELETED", "data": {"path":
"/machine/peripheral/virtio0/virtio-backend"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"DEVICE_DELETED", "data": {"device": "virtio0", "path":
"/machine/peripheral/virtio0"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"RESET"}
-{"return": [{"io-status": "ok", "device": "ide1-cd0", "locked": false,
"removable": true, "tray_open": false, "type": "unknown"}, {"device":
"floppy0", "locked": false, "removable": true, "tray_open": false, "type":
"unknown"}, {"device": "sd0", "locked": false, "removable": true, "tray_open":
false, "type": "unknown"}, {"io-status": "ok", "device": "disk", "locked":
false, "removable": true, "inserted": {"iops_rd": 0, "image": {"virtual-size":
134217728, "filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format":
"qcow2", "actual-size": 139264, "format-specific": {"type": "qcow2", "data":
{"compat": "1.1", "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr":
0, "ro": false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr":
0, "encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false}, "tray_open": false, "type": "unknown"}]}
+{"return": [{"io-status": "ok", "device": "ide1-cd0", "locked": false,
"removable": true, "tray_open": false, "type": "unknown"}, {"device":
"floppy0", "locked": false, "removable": true, "tray_open": false, "type":
"unknown"}, {"device": "sd0", "locked": false, "removable": true, "tray_open":
false, "type": "unknown"}, {"io-status": "ok", "device": "disk", "locked":
false, "removable": true, "inserted": {"iops_rd": 0, "image": {"virtual-size":
134217728, "filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format":
"qcow2", "actual-size": SIZE, "format-specific": {"type": "qcow2", "data":
{"compat": "1.1", "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr":
0, "ro": false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr":
0, "encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
"encryption_key_missing": false}, "tray_open": false, "type": "unknown"}]}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"SHUTDOWN"}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}}
--
1.8.3.1
- [Qemu-devel] [PULL 26/36] block: vhdx - add region overlap detection for image files, (continued)
- [Qemu-devel] [PULL 26/36] block: vhdx - add region overlap detection for image files, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 22/36] block: vhdx - break endian translation functions out, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 33/36] block: vhdx - add .bdrv_create() support, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 25/36] block: vhdx - log parsing, replay, and flush support, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 29/36] block: vhdx - remove BAT file offset bit shifting, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 27/36] block: vhdx - add log write support, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 24/36] block: vhdx code movement - move vhdx_close() above vhdx_open(), Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 19/36] block: vhdx - add header update capability., Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 21/36] block: vhdx - log support struct and defines, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 23/36] block: vhdx - update log guid in header, and first write tracker, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 02/36] qemu-iotests: Filter out actual image size in 067,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 30/36] block: vhdx - move more endian translations to vhdx-endian.c, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 31/36] block: vhdx - break out code operations to functions, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 32/36] block: vhdx - fix comment typos in header, fix incorrect struct fields, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 36/36] block: vhdx qemu-iotest - log replay of data sector, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 18/36] block: vhdx - minor comments and typo correction., Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 06/36] block: qemu-iotests, add quotes to $TEST_IMG.base usage in 017, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 17/36] block/vpc: fix virtual size for images created with disk2vhd, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 09/36] block: qemu-iotests, add quotes to $TEST_IMG usage for 051, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 11/36] blockdev: fix drive_init() opts and bs_opts leaks, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 28/36] block: vhdx write support, Stefan Hajnoczi, 2013/11/07