From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bxBX2-0004bz-8S for qemu-devel@nongnu.org; Thu, 20 Oct 2016 07:29:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bxBWy-0008M2-JX for qemu-devel@nongnu.org; Thu, 20 Oct 2016 07:29:08 -0400 Received: from victor.provo.novell.com ([137.65.250.26]:36268 helo=prv3-mh.provo.novell.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bxBWy-0008Ks-B1 for qemu-devel@nongnu.org; Thu, 20 Oct 2016 07:29:04 -0400 From: Lin Ma Date: Thu, 20 Oct 2016 19:28:26 +0800 Message-Id: <20161020112829.14589-3-lma@suse.com> In-Reply-To: <20161020112829.14589-1-lma@suse.com> References: <20161020112829.14589-1-lma@suse.com> Subject: [Qemu-devel] [PATCH v4 2/5] qapi: auto generate enum value strings List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: afaerber@suse.de, armbru@redhat.com, berrange@redhat.com, pbonzini@redhat.com, eblake@redhat.com Automatically generate enum value strings that containing the acceptable values. (Borrowed Daniel's code.) Signed-off-by: Lin Ma --- scripts/qapi-types.py | 2 ++ scripts/qapi.py | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index dabc42e..0446839 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -202,9 +202,11 @@ class QAPISchemaGenTypeVisitor(QAPISchemaVisitor): self._btin += gen_enum(name, values, prefix) if do_builtins: self.defn += gen_enum_lookup(name, values, prefix) + self._btin += gen_enum_value_str(name, values) else: self._fwdecl += gen_enum(name, values, prefix) self.defn += gen_enum_lookup(name, values, prefix) + self._fwdecl += gen_enum_value_str(name, values) def visit_array_type(self, name, info, element_type): if isinstance(element_type, QAPISchemaBuiltinType): diff --git a/scripts/qapi.py b/scripts/qapi.py index 21bc32f..d11c414 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1649,6 +1649,15 @@ const char *const %(c_name)s_lookup[] = { return ret +def gen_enum_value_str(name, values): + return mcgen(''' + +#define %(c_name)s_value_str "%(value_str)s" +''', + c_name=c_name(name), + value_str=", ".join(["'%s'" % c for c in values])) + + def gen_enum(name, values, prefix=None): # append automatically generated _MAX value enum_values = values + ['_MAX'] -- 2.9.2