From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vcbmv-0002X0-Ox for qemu-devel@nongnu.org; Sat, 02 Nov 2013 10:02:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vcbmq-0007wz-B2 for qemu-devel@nongnu.org; Sat, 02 Nov 2013 10:02:53 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:39512 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vcbmp-0007wP-N4 for qemu-devel@nongnu.org; Sat, 02 Nov 2013 10:02:48 -0400 Date: Sat, 2 Nov 2013 15:02:34 +0100 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20131102140234.GA3260@irqsave.net> References: <1383400331-6979-1-git-send-email-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1383400331-6979-1-git-send-email-mreitz@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] qemu-iotests: Filter out actual image size in 067 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi Le Saturday 02 Nov 2013 =E0 14:52:11 (+0100), Max Reitz a =E9crit : > 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. >=20 > Signed-off-by: Max Reitz > --- > tests/qemu-iotests/067 | 2 +- > tests/qemu-iotests/067.out | 10 +++++----- > 2 files changed, 6 insertions(+), 6 deletions(-) >=20 > 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() > =20 > 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' > } > =20 > size=3D128M > 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=3DIMGFMT size=3D134= 217728 > Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,if=3Dnone,id=3D= disk -device virtio-blk-pci,drive=3Ddisk,id=3Dvirtio0 > QMP_VERSION > {"return": {}} > -{"return": [{"io-status": "ok", "device": "disk", "locked": false, "re= movable": false, "inserted": {"iops_rd": 0, "image": {"virtual-size": 134= 217728, "filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format": = "qcow2", "actual-size": 139264, "format-specific": {"type": "qcow2", "dat= a": {"compat": "1.1", "lazy-refcounts": false}}, "dirty-flag": false}, "i= ops_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"}, {"devic= e": "sd0", "locked": false, "removable": true, "tray_open": false, "type"= : "unknown"}]} > +{"return": [{"io-status": "ok", "device": "disk", "locked": false, "re= movable": false, "inserted": {"iops_rd": 0, "image": {"virtual-size": 134= 217728, "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}, "iop= s_wr": 0, "ro": false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0= , "bps_wr": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_D= IR/t.qcow2", "encryption_key_missing": false}, "type": "unknown"}, {"io-s= tatus": "ok", "device": "ide1-cd0", "locked": false, "removable": true, "= tray_open": false, "type": "unknown"}, {"device": "floppy0", "locked": fa= lse, "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}, "ev= ent": "DEVICE_DELETED", "data": {"path": "/machine/peripheral/virtio0/vir= tio-backend"}} > @@ -24,7 +24,7 @@ QMP_VERSION > Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,if=3Dnone,id=3D= disk > QMP_VERSION > {"return": {}} > -{"return": [{"device": "disk", "locked": false, "removable": true, "in= serted": {"iops_rd": 0, "image": {"virtual-size": 134217728, "filename": = "TEST_DIR/t.qcow2", "cluster-size": 65536, "format": "qcow2", "actual-siz= e": 139264, "format-specific": {"type": "qcow2", "data": {"compat": "1.1"= , "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": fa= lse, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "en= crypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2", "encr= yption_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"}, {"devic= e": "sd0", "locked": false, "removable": true, "tray_open": false, "type"= : "unknown"}]} > +{"return": [{"device": "disk", "locked": false, "removable": true, "in= serted": {"iops_rd": 0, "image": {"virtual-size": 134217728, "filename": = "TEST_DIR/t.qcow2", "cluster-size": 65536, "format": "qcow2", "actual-siz= e": SIZE, "format-specific": {"type": "qcow2", "data": {"compat": "1.1", = "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": fals= e, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "encr= ypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2", "encryp= tion_key_missing": false}, "tray_open": false, "type": "unknown"}, {"io-s= tatus": "ok", "device": "ide1-cd0", "locked": false, "removable": true, "= tray_open": false, "type": "unknown"}, {"device": "floppy0", "locked": fa= lse, "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": "f= loppy0", "locked": false, "removable": true, "tray_open": false, "type": = "unknown"}, {"device": "sd0", "locked": false, "removable": true, "tray_o= pen": false, "type": "unknown"}, {"device": "disk", "locked": false, "rem= ovable": true, "inserted": {"iops_rd": 0, "image": {"virtual-size": 13421= 7728, "filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format": "q= cow2", "actual-size": 139264, "format-specific": {"type": "qcow2", "data"= : {"compat": "1.1", "lazy-refcounts": false}}, "dirty-flag": false}, "iop= s_wr": 0, "ro": false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0= , "bps_wr": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_D= IR/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": "f= loppy0", "locked": false, "removable": true, "tray_open": false, "type": = "unknown"}, {"device": "sd0", "locked": false, "removable": true, "tray_o= pen": false, "type": "unknown"}, {"device": "disk", "locked": false, "rem= ovable": true, "inserted": {"iops_rd": 0, "image": {"virtual-size": 13421= 7728, "filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format": "q= cow2", "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": "f= loppy0", "locked": false, "removable": true, "tray_open": false, "type": = "unknown"}, {"device": "sd0", "locked": false, "removable": true, "tray_o= pen": false, "type": "unknown"}, {"device": "disk", "locked": false, "rem= ovable": true, "inserted": {"iops_rd": 0, "image": {"virtual-size": 13421= 7728, "filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format": "q= cow2", "actual-size": 139264, "format-specific": {"type": "qcow2", "data"= : {"compat": "1.1", "lazy-refcounts": false}}, "dirty-flag": false}, "iop= s_wr": 0, "ro": false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0= , "bps_wr": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_D= IR/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": "f= loppy0", "locked": false, "removable": true, "tray_open": false, "type": = "unknown"}, {"device": "sd0", "locked": false, "removable": true, "tray_o= pen": false, "type": "unknown"}, {"device": "disk", "locked": false, "rem= ovable": true, "inserted": {"iops_rd": 0, "image": {"virtual-size": 13421= 7728, "filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format": "q= cow2", "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}, "ev= ent": "DEVICE_DELETED", "data": {"path": "/machine/peripheral/virtio0/vir= tio-backend"}} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "ev= ent": "DEVICE_DELETED", "data": {"device": "virtio0", "path": "/machine/p= eripheral/virtio0"}} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "ev= ent": "RESET"} > -{"return": [{"io-status": "ok", "device": "ide1-cd0", "locked": false,= "removable": true, "tray_open": false, "type": "unknown"}, {"device": "f= loppy0", "locked": false, "removable": true, "tray_open": false, "type": = "unknown"}, {"device": "sd0", "locked": false, "removable": true, "tray_o= pen": false, "type": "unknown"}, {"io-status": "ok", "device": "disk", "l= ocked": false, "removable": true, "inserted": {"iops_rd": 0, "image": {"v= irtual-size": 134217728, "filename": "TEST_DIR/t.qcow2", "cluster-size": = 65536, "format": "qcow2", "actual-size": 139264, "format-specific": {"typ= e": "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_o= pen": false, "type": "unknown"}]} > +{"return": [{"io-status": "ok", "device": "ide1-cd0", "locked": false,= "removable": true, "tray_open": false, "type": "unknown"}, {"device": "f= loppy0", "locked": false, "removable": true, "tray_open": false, "type": = "unknown"}, {"device": "sd0", "locked": false, "removable": true, "tray_o= pen": false, "type": "unknown"}, {"io-status": "ok", "device": "disk", "l= ocked": false, "removable": true, "inserted": {"iops_rd": 0, "image": {"v= irtual-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-fl= ag": 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_ope= n": false, "type": "unknown"}]} > {"return": {}} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "ev= ent": "SHUTDOWN"} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "ev= ent": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": tr= ue}} > --=20 > 1.8.4.1 >=20 >=20 Reviewed-by: Benoit Canet