From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aX8h4-00074V-VE for qemu-devel@nongnu.org; Sat, 20 Feb 2016 09:39:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aX8h3-0004qt-QH for qemu-devel@nongnu.org; Sat, 20 Feb 2016 09:39:34 -0500 References: <1455886869-139916-1-git-send-email-silbe@linux.vnet.ibm.com> <1455886869-139916-2-git-send-email-silbe@linux.vnet.ibm.com> From: Max Reitz Message-ID: <56C87A9D.4040801@redhat.com> Date: Sat, 20 Feb 2016 15:39:25 +0100 MIME-Version: 1.0 In-Reply-To: <1455886869-139916-2-git-send-email-silbe@linux.vnet.ibm.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="XtOMsbv3IXpxw74JqiLS5g5xoKxV0hEoB" Subject: Re: [Qemu-devel] [PATCH v2 1/1] qemu-iotests: 067: ignore QMP events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Sascha Silbe , qemu-devel@nongnu.org, qemu-block@nongnu.org, Kevin Wolf , Eric Blake Cc: Tu Bo This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --XtOMsbv3IXpxw74JqiLS5g5xoKxV0hEoB Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 19.02.2016 14:01, Sascha Silbe wrote: > The relative ordering of "device_del" return value and the > "DEVICE_DELETED" QMP event depends on the architecture being > tested. On x86 unplugging virtio disks is asynchronous > (=3Dqdev_unplug()=3D =E2=86=92 =3Dhotplug_handler_unplug_request()=3D) = while on s390x > it is synchronous (=3Dqdev_unplug()=3D =E2=86=92 =3Dhotplug_handler_unp= lug()=3D). This > leads to the actual output on s390x consistently differing from the > reference output (that was probably produced on x86). >=20 > The easiest way to address this is to filter out QMP events in > 067. The DEVICE_DELETED event is already getting explicitly tested by > the Python-based test case 139, so the test coverage should be > unaffected. Make use of the recently introduced _filter_qmp_events() > to remove QMP events from the test case output and adjust the > reference output accordingly. >=20 > The tr / sed / tr trick used for filtering was suggested by Max Reitz > . >=20 > Signed-off-by: Sascha Silbe > --- > v1->v2: > - squashed the two patches > - using tr + sed incantation so we can keep the pretty-printing, but > moved the filter into 067 as it's not general enough for > common.filter > --- > tests/qemu-iotests/067 | 11 +++- > tests/qemu-iotests/067.out | 144 -------------------------------------= -------- > 2 files changed, 10 insertions(+), 145 deletions(-) Thanks, applied to my block tree: https://github.com/XanClic/qemu/commits/block Max --XtOMsbv3IXpxw74JqiLS5g5xoKxV0hEoB Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJWyHqdAAoJEDuxQgLoOKytd6AH/A7XgZ8wDUr+Hf/8JTxgEX48 3UA2CHDc1lyTCoRuleY6BhUYU2SM60kMWVCAxXgTFSBI8sp54i7AiasGqH8OuVLc qSG4LKAMygtN6Hkyuqd/q+x7mi2qqVGPhkMthxjwZlaHK+gagc/7qGeBfYrV5GzR vqe1hZTAmOQga+wQQ+sqEwVGG7Wz1Z90b2SfkJa1gfCA21t33ERcFvJBit+fjo+S 8DgsAi8AtJ4L8sHyEsh7CvbkjNWMvqO3idfMe6NfXlDLh5LqTWvda6xzkNVe7ubw Anq8ku31Qi4m7fPKRnSugrE+4RKhbVxHslT12SK5R9iOVq9f1Odk4yHqJqOg2/o= =TwAm -----END PGP SIGNATURE----- --XtOMsbv3IXpxw74JqiLS5g5xoKxV0hEoB--