From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44066) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjrJz-0003MR-2j for qemu-devel@nongnu.org; Wed, 07 Oct 2015 12:12:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjrJv-0000n3-PP for qemu-devel@nongnu.org; Wed, 07 Oct 2015 12:12:02 -0400 Received: from resqmta-po-09v.sys.comcast.net ([2001:558:fe16:19:96:114:154:168]:33824) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjrJv-0000mn-Ju for qemu-devel@nongnu.org; Wed, 07 Oct 2015 12:11:59 -0400 From: Eric Blake Date: Wed, 7 Oct 2015 10:11:48 -0600 Message-Id: <1444234308-7723-1-git-send-email-eblake@redhat.com> In-Reply-To: <1443930073-19359-8-git-send-email-eblake@redhat.com> References: <1443930073-19359-8-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH] fixup to qapi: Move union tag quirks into subclass List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , Michael Roth Signed-off-by: Eric Blake --- I noticed a couple more places that could use the c_name() function; I'll be squashing this into 7/14 if I need to do a v8 spin. scripts/qapi-commands.py | 4 ++-- scripts/qapi.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index ff52ca9..53a79ab 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -32,8 +32,8 @@ def gen_call(name, arg_type, ret_type): if arg_type: for memb in arg_type.members: if memb.optional: - argstr += 'has_%s, ' % memb.c_name() - argstr += '%s, ' % memb.c_name() + argstr += 'has_' + memb.c_name() + ', ' + argstr += memb.c_name() + ', ' lhs = '' if ret_type: diff --git a/scripts/qapi.py b/scripts/qapi.py index f5040da..37b38b0 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1572,8 +1572,8 @@ def gen_params(arg_type, extra): ret += sep sep = ', ' if memb.optional: - ret += 'bool has_%s, ' % c_name(memb.name) - ret += '%s %s' % (memb.type.c_type(is_param=True), c_name(memb.name)) + ret += 'bool has_' + memb.c_name() + sep + ret += '%s %s' % (memb.type.c_type(is_param=True), memb.c_name()) if extra: ret += sep + extra return ret @@ -1602,13 +1602,13 @@ def gen_visit_fields(members, prefix='', need_cast=False, skiperr=False): ret += mcgen(''' visit_optional(v, &%(prefix)shas_%(c_name)s, "%(name)s", %(errp)s); ''', - prefix=prefix, c_name=c_name(memb.name), + prefix=prefix, c_name=memb.c_name(), name=memb.name, errp=errparg) ret += gen_err_check(skiperr=skiperr) ret += mcgen(''' if (%(prefix)shas_%(c_name)s) { ''', - prefix=prefix, c_name=c_name(memb.name)) + prefix=prefix, c_name=memb.c_name()) push_indent() # Ugly: sometimes we need to cast away const @@ -1621,7 +1621,7 @@ def gen_visit_fields(members, prefix='', need_cast=False, skiperr=False): visit_type_%(c_type)s(v, %(cast)s&%(prefix)s%(c_name)s, "%(name)s", %(errp)s); ''', c_type=memb.type.c_name(), prefix=prefix, cast=cast, - c_name=c_name(memb.name), name=memb.name, + c_name=memb.c_name(), name=memb.name, errp=errparg) ret += gen_err_check(skiperr=skiperr) -- 2.4.3