From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43657) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drMZi-0006YU-Kw for qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drMZh-0007Dj-Jo for qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56930) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1drMZh-0007Ch-DC for qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:21 -0400 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Mon, 11 Sep 2017 13:06:14 +0200 Message-Id: <20170911110623.24981-42-marcandre.lureau@redhat.com> In-Reply-To: <20170911110623.24981-1-marcandre.lureau@redhat.com> References: <20170911110623.24981-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 41/50] qapi: add a 'unit' pragma List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Michael Roth Add a pragma that allows to tag the following expressions with a unit name. By default, an expression has no unit name. Signed-off-by: Marc-Andr=C3=A9 Lureau --- scripts/qapi.py | 9 ++++++++- docs/devel/qapi-code-gen.txt | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index eb4ffdc06d..1d0defd638 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -279,10 +279,12 @@ class QAPISchemaParser(object): self.docs =3D [] self.cur_doc =3D None self.accept() + self.unit =3D None =20 while self.tok is not None: info =3D {'file': fname, 'line': self.line, - 'parent': self.incl_info} + 'parent': self.incl_info, + 'unit': self.unit} if self.tok =3D=3D '#': self.reject_expr_doc() self.cur_doc =3D self.get_doc(info) @@ -371,6 +373,11 @@ class QAPISchemaParser(object): "Pragma name-case-whitelist must be" " a list of strings") name_case_whitelist =3D value + elif name =3D=3D 'unit': + if not isinstance(value, str): + raise QAPISemError(info, + "Pragma 'unit' must be string") + self.unit =3D value else: raise QAPISemError(info, "Unknown pragma '%s'" % name) =20 diff --git a/docs/devel/qapi-code-gen.txt b/docs/devel/qapi-code-gen.txt index 24fc6f74ee..37a27cd9d7 100644 --- a/docs/devel/qapi-code-gen.txt +++ b/docs/devel/qapi-code-gen.txt @@ -326,6 +326,9 @@ violate the rules on permitted return types. Default= is none. Pragma 'name-case-whitelist' takes a list of names that may violate rules on use of upper- vs. lower-case letters. Default is none. =20 +Pragma 'unit' takes a string value. It will set the unit name for the +following expressions in the schema. Most code generator can filter +based on a unit name. Default is none. =20 =3D=3D=3D Struct types =3D=3D=3D =20 --=20 2.14.1.146.gd35faa819