From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1129FC282DD for ; Thu, 23 May 2019 17:50:40 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C3D192184B for ; Thu, 23 May 2019 17:50:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C3D192184B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:41313 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTrrS-0004bC-Q5 for qemu-devel@archiver.kernel.org; Thu, 23 May 2019 13:50:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTrqW-000463-Pb for qemu-devel@nongnu.org; Thu, 23 May 2019 13:49:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTrqV-0007SU-Pl for qemu-devel@nongnu.org; Thu, 23 May 2019 13:49:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60122) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hTrqT-0007Qb-AN; Thu, 23 May 2019 13:49:37 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 65798C05168F; Thu, 23 May 2019 17:49:24 +0000 (UTC) Received: from dresden.str.redhat.com (unknown [10.40.205.176]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 340D41001E6C; Thu, 23 May 2019 17:49:18 +0000 (UTC) To: John Snow , qemu-devel@nongnu.org, qemu-block@nongnu.org References: <20190523170643.20794-1-jsnow@redhat.com> <20190523170643.20794-4-jsnow@redhat.com> From: Max Reitz Openpgp: preference=signencrypt Autocrypt: addr=mreitz@redhat.com; prefer-encrypt=mutual; keydata= mQENBFXOJlcBCADEyyhOTsoa/2ujoTRAJj4MKA21dkxxELVj3cuILpLTmtachWj7QW+TVG8U /PsMCFbpwsQR7oEy8eHHZwuGQsNpEtNC2G/L8Yka0BIBzv7dEgrPzIu+W3anZXQW4702+uES U29G8TP/NGfXRRHGlbBIH9KNUnOSUD2vRtpOLXkWsV5CN6vQFYgQfFvmp5ZpPeUe6xNplu8V mcTw8OSEDW/ZnxJc8TekCKZSpdzYoxfzjm7xGmZqB18VFwgJZlIibt1HE0EB4w5GsD7x5ekh awIe3RwoZgZDLQMdOitJ1tUc8aqaxvgA4tz6J6st8D8pS//m1gAoYJWGwwIVj1DjTYLtABEB AAG0HU1heCBSZWl0eiA8bXJlaXR6QHJlZGhhdC5jb20+iQFTBBMBCAA9AhsDBQkSzAMABQsJ CAcCBhUICQoLAgQWAgMBAh4BAheABQJVzie5FRhoa3A6Ly9rZXlzLmdudXBnLm5ldAAKCRD0 B9sAYdXPQDcIB/9uNkbYEex1rHKz3mr12uxYMwLOOFY9fstP5aoVJQ1nWQVB6m2cfKGdcRe1 2/nFaHSNAzT0NnKz2MjhZVmcrpyd2Gp2QyISCfb1FbT82GMtXFj1wiHmPb3CixYmWGQUUh+I AvUqsevLA+WihgBUyaJq/vuDVM1/K9Un+w+Tz5vpeMidlIsTYhcsMhn0L9wlCjoucljvbDy/ 8C9L2DUdgi3XTa0ORKeflUhdL4gucWoAMrKX2nmPjBMKLgU7WLBc8AtV+84b9OWFML6NEyo4 4cP7cM/07VlJK53pqNg5cHtnWwjHcbpGkQvx6RUx6F1My3y52vM24rNUA3+ligVEgPYBuQEN BFXOJlcBCADAmcVUNTWT6yLWQHvxZ0o47KCP8OcLqD+67T0RCe6d0LP8GsWtrJdeDIQk+T+F xO7DolQPS6iQ6Ak2/lJaPX8L0BkEAiMuLCKFU6Bn3lFOkrQeKp3u05wCSV1iKnhg0UPji9V2 W5eNfy8F4ZQHpeGUGy+liGXlxqkeRVhLyevUqfU0WgNqAJpfhHSGpBgihUupmyUg7lfUPeRM DzAN1pIqoFuxnN+BRHdAecpsLcbR8sQddXmDg9BpSKozO/JyBmaS1RlquI8HERQoe6EynJhd 64aICHDfj61rp+/0jTIcevxIIAzW70IadoS/y3DVIkuhncgDBvGbF3aBtjrJVP+5ABEBAAGJ ASUEGAEIAA8FAlXOJlcCGwwFCRLMAwAACgkQ9AfbAGHVz0CbFwf9F/PXxQR9i4N0iipISYjU sxVdjJOM2TMut+ZZcQ6NSMvhZ0ogQxJ+iEQ5OjnIputKvPVd5U7WRh+4lF1lB/NQGrGZQ1ic alkj6ocscQyFwfib+xIe9w8TG1CVGkII7+TbS5pXHRxZH1niaRpoi/hYtgzkuOPp35jJyqT/ /ELbqQTDAWcqtJhzxKLE/ugcOMK520dJDeb6x2xVES+S5LXby0D4juZlvUj+1fwZu+7Io5+B bkhSVPb/QdOVTpnz7zWNyNw+OONo1aBUKkhq2UIByYXgORPFnbfMY7QWHcjpBVw9MgC4tGeF R4bv+1nAMMxKmb5VvQCExr0eFhJUAHAhVg== Message-ID: <8a8882b0-b752-0106-88c3-818f42852eef@redhat.com> Date: Thu, 23 May 2019 19:49:16 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190523170643.20794-4-jsnow@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="NoP1JKmmi2AGpZGSonHHlFrrZ7ozOmKuM" X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 23 May 2019 17:49:36 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 X-Content-Filtered-By: Mailman/MimeDel 2.1.21 Subject: Re: [Qemu-devel] [PATCH v3 3/5] QEMUMachine: add events_wait method X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Markus Armbruster , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --NoP1JKmmi2AGpZGSonHHlFrrZ7ozOmKuM From: Max Reitz To: John Snow , qemu-devel@nongnu.org, qemu-block@nongnu.org Cc: Markus Armbruster , eblake@redhat.com, qemu-stable@nongnu.org, Kevin Wolf Message-ID: <8a8882b0-b752-0106-88c3-818f42852eef@redhat.com> Subject: Re: [PATCH v3 3/5] QEMUMachine: add events_wait method References: <20190523170643.20794-1-jsnow@redhat.com> <20190523170643.20794-4-jsnow@redhat.com> In-Reply-To: <20190523170643.20794-4-jsnow@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 23.05.19 19:06, John Snow wrote: > Instead of event_wait which looks for a single event, add an events_wai= t > which can look for any number of events simultaneously. However, it > will still only return one at a time, whichever happens first. >=20 > Signed-off-by: John Snow > --- > python/qemu/__init__.py | 69 +++++++++++++++++++++++++++++------------= > 1 file changed, 49 insertions(+), 20 deletions(-) >=20 > diff --git a/python/qemu/__init__.py b/python/qemu/__init__.py > index 81d9657ec0..98ed8a2e28 100644 > --- a/python/qemu/__init__.py > +++ b/python/qemu/__init__.py > @@ -402,42 +402,71 @@ class QEMUMachine(object): > self._qmp.clear_events() > return events > =20 > - def event_wait(self, name, timeout=3D60.0, match=3DNone): > + @staticmethod > + def event_match(event, match=3DNone): > """ > - Wait for specified timeout on named event in QMP; optionally f= ilter > - results by match. > + Check if an event matches optional match criteria. > =20 > - The 'match' is checked to be a recursive subset of the 'event'= ; skips > - branch processing on match's value None > - {"foo": {"bar": 1}} matches {"foo": None} > - {"foo": {"bar": 1}} does not matches {"foo": {"baz": None}}= > + The match criteria takes the form of a matching subdict. The e= vent is > + checked to be a superset of the subdict, recursively, with mat= ching > + values whenever those values are not None. > + > + Examples, with the subdict queries on the left: > + - None matches any object. > + - {"foo": None} matches {"foo": {"bar": 1}} > + - {"foo": {"baz": None}} does not match {"foo": {"bar": 1}} Pre-existing, but the difference between =E2=80=9Cbar=E2=80=9D and =E2=80= =9Cbaz=E2=80=9D confused me quite a bit. Also, I wonder... {"foo": None} would not match {"foo": 1}, right? Does that make sense? Shouldn=E2=80=99t None be the wildcard here in gen= eral? (Also pre-existing of course.) But this patch doesn=E2=80=99t make things worse, so: Reviewed-by: Max Reitz (I=E2=80=99d still like your opinion.) --NoP1JKmmi2AGpZGSonHHlFrrZ7ozOmKuM Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEkb62CjDbPohX0Rgp9AfbAGHVz0AFAlzm3RwACgkQ9AfbAGHV z0Ax4wf+KqYJCZJSAor/8FYFIQtImuwDqJu/i28vBC+fG2cD58N8eOEbxi5POgcR NeKGfXcJj3xArD7vcjLR4B1h9kz+jubuClRXm5gWtYs66mnh0dG7zxv/4OD5oIgE EgMcd7qIPmfRuWasZh+IPQpoKm+juo/32ytfrNroTPwW+9pQ+hoAt/+wFEU1z7Qb o/evfJM2VE3npgQaHMKSHLR1Z5hMDdMJ2ab7cdmWQ8WfADhlGZUe5IyJuZ02HxYM vJJrkyzynVOkFB2yPK5tqebnotPSMenAQv0MCopbTO99TT7JpYXzWR09hoV7jNxt pAru0rfkIUetmqdmYa7pYXxPy1NXVg== =HULs -----END PGP SIGNATURE----- --NoP1JKmmi2AGpZGSonHHlFrrZ7ozOmKuM--