From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtAvY-0005po-3y for qemu-devel@nongnu.org; Fri, 15 May 2015 04:25:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YtAvV-0004ZS-Ax for qemu-devel@nongnu.org; Fri, 15 May 2015 04:25:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34026) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtAvV-0004Yv-4m for qemu-devel@nongnu.org; Fri, 15 May 2015 04:25:01 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id D1441A0E69 for ; Fri, 15 May 2015 08:25:00 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-59.ams2.redhat.com [10.36.116.59]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4F8OwYR016649 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 15 May 2015 04:25:00 -0400 From: Markus Armbruster Date: Fri, 15 May 2015 10:24:52 +0200 Message-Id: <1431678292-17692-27-git-send-email-armbru@redhat.com> In-Reply-To: <1431678292-17692-1-git-send-email-armbru@redhat.com> References: <1431678292-17692-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 26/26] qapi: Inline gen_command_decl_prologue(), gen_command_def_prologue() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- scripts/qapi-commands.py | 58 ++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 34 deletions(-) diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index c3e420e..1c1d3aa 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -309,36 +309,6 @@ qapi_init(qmp_init_marshal); registry=registry.rstrip()) return ret -def gen_command_decl_prologue(prefix=""): - ret = mcgen(''' -#include "%(prefix)sqapi-types.h" -#include "qapi/qmp/qdict.h" -#include "qapi/error.h" - -''', - prefix=prefix) - return ret - -def gen_command_def_prologue(prefix="", proxy=False): - ret = mcgen(''' -#include "qemu-common.h" -#include "qemu/module.h" -#include "qapi/qmp/qerror.h" -#include "qapi/qmp/types.h" -#include "qapi/qmp/dispatch.h" -#include "qapi/visitor.h" -#include "qapi/qmp-output-visitor.h" -#include "qapi/qmp-input-visitor.h" -#include "qapi/dealloc-visitor.h" -#include "%(prefix)sqapi-types.h" -#include "%(prefix)sqapi-visit.h" - -''', - prefix=prefix) - if not proxy: - ret += '#include "%sqmp-commands.h"' % prefix - return ret + "\n\n" - middle_mode = False (input_file, output_dir, do_c, do_h, prefix, opts) = \ @@ -385,10 +355,30 @@ h_comment = ''' 'qmp-marshal.c', 'qmp-commands.h', c_comment, h_comment) -ret = gen_command_decl_prologue(prefix=prefix) -fdecl.write(ret) -ret = gen_command_def_prologue(prefix=prefix) -fdef.write(ret) +fdef.write(mcgen(''' +#include "qemu-common.h" +#include "qemu/module.h" +#include "qapi/qmp/qerror.h" +#include "qapi/qmp/types.h" +#include "qapi/qmp/dispatch.h" +#include "qapi/visitor.h" +#include "qapi/qmp-output-visitor.h" +#include "qapi/qmp-input-visitor.h" +#include "qapi/dealloc-visitor.h" +#include "%(prefix)sqapi-types.h" +#include "%(prefix)sqapi-visit.h" +#include "%(prefix)sqmp-commands.h" + +''', + prefix=prefix)) + +fdecl.write(mcgen(''' +#include "%(prefix)sqapi-types.h" +#include "qapi/qmp/qdict.h" +#include "qapi/error.h" + +''', + prefix=prefix)) for cmd in commands: arglist = [] -- 1.9.3