[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 15/19] qapi: Inline gen_command_decl_prologue(),
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH RFC 15/19] qapi: Inline gen_command_decl_prologue(), gen_command_def_prologue() |
Date: |
Thu, 2 Apr 2015 19:28:59 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
---
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 10fa570..bf41a78 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -319,36 +319,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) = \
@@ -395,10 +365,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
- [Qemu-devel] [PATCH RFC 00/19] qapi: QMP introspection, Markus Armbruster, 2015/04/02
- [Qemu-devel] [PATCH RFC 06/19] qapi: Use c_enum_const() in generate_alternate_qtypes(), Markus Armbruster, 2015/04/02
- [Qemu-devel] [PATCH RFC 07/19] qapi: Move camel_to_upper(), c_enum_const() to closely related code, Markus Armbruster, 2015/04/02
- [Qemu-devel] [PATCH RFC 12/19] qapi: Turn generators' mandatory option -i into an argument, Markus Armbruster, 2015/04/02
- [Qemu-devel] [PATCH RFC 09/19] qapi: qapi-commands.py option --type is unused, drop it, Markus Armbruster, 2015/04/02
- [Qemu-devel] [PATCH RFC 15/19] qapi: Inline gen_command_decl_prologue(), gen_command_def_prologue(),
Markus Armbruster <=
- [Qemu-devel] [PATCH RFC 17/19] qobject: Add a special null QObject, Markus Armbruster, 2015/04/02
- [Qemu-devel] [PATCH RFC 14/19] qapi: Drop pointless flush() before close(), Markus Armbruster, 2015/04/02
- [Qemu-devel] [PATCH RFC 18/19] json-parser: Fix to recognize null, Markus Armbruster, 2015/04/02
- [Qemu-devel] [PATCH RFC 19/19] qapi: New QMP command query-schema for QMP schema introspection, Markus Armbruster, 2015/04/02