From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3KSI-0002cL-8q for qemu-devel@nongnu.org; Wed, 15 Jan 2014 02:00:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W3KSC-0007yo-LF for qemu-devel@nongnu.org; Wed, 15 Jan 2014 02:00:02 -0500 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:60953 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3KSC-0007yb-7I for qemu-devel@nongnu.org; Wed, 15 Jan 2014 01:59:56 -0500 Message-ID: <52D6324E.9090800@kamp.de> Date: Wed, 15 Jan 2014 08:01:34 +0100 From: Peter Lieven MIME-Version: 1.0 References: <1389608518-4813-1-git-send-email-pl@kamp.de> <1389608518-4813-6-git-send-email-pl@kamp.de> <20140115065442.GC25475@T430.nay.redhat.com> In-Reply-To: <20140115065442.GC25475@T430.nay.redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCHv6 5/6] qemu-iotests: fix expected output of test 067 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: Kevin Wolf , ronniesahlberg@gmail.com, Jeff Cody , qemu-devel@nongnu.org, Max Reitz , owasserm@redhat.com, Federico Simoncelli , Stefan Hajnoczi , Wenchao Xia On 15.01.2014 07:54, Fam Zheng wrote: > On Mon, 01/13 11:21, Peter Lieven wrote: >> Signed-off-by: Peter Lieven >> --- >> tests/qemu-iotests/067.out | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/tests/qemu-iotests/067.out b/tests/qemu-iotests/067.out >> index 8d271cc..79ed90f 100644 >> --- a/tests/qemu-iotests/067.out >> +++ b/tests/qemu-iotests/067.out >> @@ -12,7 +12,7 @@ QMP_VERSION >> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "= event": "DEVICE_DELETED", "data": {"path": "/machine/peripheral/virtio0/v= irtio-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"}]} >> +{"return": [{"io-status": "ok", "device": "disk", "locked": false, "r= emovable": false, "inserted": {"iops_rd": 0, "image": {"virtual-size": 13= 4217728, "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}, "io= ps_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": f= alse, "removable": true, "tray_open": false, "type": "unknown"}, {"device= ": "sd0", "locked": false, "removable": true, "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}} >> @@ -31,7 +31,7 @@ QMP_VERSION >> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "= event": "DEVICE_DELETED", "data": {"path": "/machine/peripheral/virtio0/v= irtio-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"}]} >> +{"return": [{"io-status": "ok", "device": "disk", "locked": false, "r= emovable": false, "inserted": {"iops_rd": 0, "image": {"virtual-size": 13= 4217728, "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}, "io= ps_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": f= alse, "removable": true, "tray_open": false, "type": "unknown"}, {"device= ": "sd0", "locked": false, "removable": true, "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}} >> @@ -51,7 +51,7 @@ QMP_VERSION >> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "= event": "DEVICE_DELETED", "data": {"path": "/machine/peripheral/virtio0/v= irtio-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"}]} >> +{"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": false, "inserted": {"iops_rd": 0, "image": {= "virtual-size": 134217728, "filename": "TEST_DIR/t.qcow2", "cluster-size"= : 65536, "format": "qcow2", "actual-size": SIZE, "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}, "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}} >> @@ -71,7 +71,7 @@ QMP_VERSION >> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "= event": "DEVICE_DELETED", "data": {"path": "/machine/peripheral/virtio0/v= irtio-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": SIZE, "format-specific": {"type= ": "qcow2", "data": {"compat": "1.1", "lazy-refcounts": false}}, "dirty-f= lag": 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_op= en": 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": false, "inserted": {"iops_rd": 0, "image": {= "virtual-size": 134217728, "filename": "TEST_DIR/t.qcow2", "cluster-size"= : 65536, "format": "qcow2", "actual-size": SIZE, "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}, "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}} >> --=20 >> 1.7.9.5 >> > Didn't look closely, but this still fails for me with your series appli= ed: > > QEMU -- ../../x86_64-softmmu/qemu-system-x86_64 > QEMU_IMG -- ../../qemu-img > QEMU_IO -- ../../qemu-io > QEMU_NBD -- ../../qemu-nbd > IMGFMT -- qcow2 (compat=3D1.1) > IMGPROTO -- file > PLATFORM -- Linux/x86_64 T430 3.12.7-2-ARCH > SOCKET_SCM_HELPER -- > > 067 - output mismatch (see 067.out.bad) > --- 067.out 2014-01-15 14:28:00.827531423 +0800 > +++ 067.out.bad 2014-01-15 14:53:02.564180828 +0800 > @@ -12,7 +12,7 @@ > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "DEVICE_DELETED", "data": {"path": "/machine/peripheral/virtio0/vi= rtio-backend"}} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "DEVICE_DELETED", "data": {"device": "virtio0", "path": "/machine/= peripheral/virtio0"}} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "RESET"} > -{"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": [{"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"}]} > {"return": {}} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "SHUTDOWN"} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": t= rue}} > @@ -31,7 +31,7 @@ > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "DEVICE_DELETED", "data": {"path": "/machine/peripheral/virtio0/vi= rtio-backend"}} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "DEVICE_DELETED", "data": {"device": "virtio0", "path": "/machine/= peripheral/virtio0"}} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "RESET"} > -{"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": [{"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"}]} > {"return": {}} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "SHUTDOWN"} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": t= rue}} > @@ -51,7 +51,7 @@ > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "DEVICE_DELETED", "data": {"path": "/machine/peripheral/virtio0/vi= rtio-backend"}} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "DEVICE_DELETED", "data": {"device": "virtio0", "path": "/machine/= peripheral/virtio0"}} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "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": 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-f= lag": 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"}]} > +{"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"}]} > {"return": {}} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "SHUTDOWN"} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": t= rue}} > @@ -71,7 +71,7 @@ > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "DEVICE_DELETED", "data": {"path": "/machine/peripheral/virtio0/vi= rtio-backend"}} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "DEVICE_DELETED", "data": {"device": "virtio0", "path": "/machine/= peripheral/virtio0"}} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "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": 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-f= lag": 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"}]} > +{"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}, "e= vent": "SHUTDOWN"} > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "e= vent": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": t= rue}} > Failures: 067 > Failed 1 of 1 tests > It seems the output was changed again without adjusting this patch. Maybe= this patch should be adjusted to filter out the fields that we are inter= ested in. Peter