From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drMZh-0006XR-Kq for qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drMZg-0007BQ-4R for qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56850) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1drMZf-0007AQ-Sc for qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:20 -0400 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Mon, 11 Sep 2017 13:06:13 +0200 Message-Id: <20170911110623.24981-41-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 40/50] qapi: add -i/--include filename.h 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 new option to add user-specified #include lines in the generated headers. This will help to split a schema, where one generated header will depend on another. Signed-off-by: Marc-Andr=C3=A9 Lureau --- scripts/qapi.py | 13 +++++++++---- scripts/qapi-commands.py | 7 +++++-- scripts/qapi-event.py | 6 ++++-- scripts/qapi-introspect.py | 5 +++-- scripts/qapi-types.py | 6 ++++-- scripts/qapi-visit.py | 5 +++-- 6 files changed, 28 insertions(+), 14 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 19e48bd4d2..eb4ffdc06d 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -2096,9 +2096,9 @@ def parse_command_line(extra_options=3D'', extra_lo= ng_options=3D[]): =20 try: opts, args =3D getopt.gnu_getopt(sys.argv[1:], - 'chp:o:' + extra_options, - ['source', 'header', 'prefix=3D', - 'output-dir=3D'] + extra_long_op= tions) + 'chp:o:i:' + extra_options, + ['source', 'header', 'prefix=3D', 'output-dir=3D', + 'include=3D'] + extra_long_options) except getopt.GetoptError as err: print >>sys.stderr, "%s: %s" % (sys.argv[0], str(err)) sys.exit(1) @@ -2107,6 +2107,7 @@ def parse_command_line(extra_options=3D'', extra_lo= ng_options=3D[]): prefix =3D '' do_c =3D False do_h =3D False + includes =3D [] extra_opts =3D [] =20 for oa in opts: @@ -2125,6 +2126,8 @@ def parse_command_line(extra_options=3D'', extra_lo= ng_options=3D[]): do_c =3D True elif o in ('-h', '--header'): do_h =3D True + elif o in ('-i', '--include'): + includes.append(a) else: extra_opts.append(oa) =20 @@ -2137,7 +2140,9 @@ def parse_command_line(extra_options=3D'', extra_lo= ng_options=3D[]): sys.exit(1) fname =3D args[0] =20 - return (fname, output_dir, do_c, do_h, prefix, extra_opts) + includes =3D "\n".join(['#include "%s"' % inc for inc in includes]) + + return (fname, output_dir, do_c, do_h, prefix, includes, extra_opts) =20 # # Generate output files with boilerplate diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index 7455d2b8bb..4841f4d9a1 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -253,7 +253,8 @@ class QAPISchemaGenCommandVisitor(QAPISchemaVisitor): self._regy +=3D gen_register_command(name, success_response) =20 =20 -(input_file, output_dir, do_c, do_h, prefix, opts) =3D parse_command_lin= e() +(input_file, output_dir, do_c, do_h, prefix, includes, opts) =3D \ + parse_command_line() =20 c_comment =3D ''' /* @@ -305,6 +306,7 @@ fdef.write(mcgen(''' prefix=3Dprefix)) =20 fdecl.write(mcgen(''' +%(includes)s #include "%(prefix)sqapi-types.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/dispatch.h" @@ -312,7 +314,8 @@ fdecl.write(mcgen(''' =20 void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds); ''', - prefix=3Dprefix, c_prefix=3Dc_name(prefix, protect=3DF= alse))) + includes=3Dincludes, prefix=3Dprefix, + c_prefix=3Dc_name(prefix, protect=3DFalse))) =20 schema =3D QAPISchema(input_file) gen =3D QAPISchemaGenCommandVisitor() diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py index 60c6f7030d..0aba866dc8 100644 --- a/scripts/qapi-event.py +++ b/scripts/qapi-event.py @@ -171,7 +171,8 @@ class QAPISchemaGenEventVisitor(QAPISchemaVisitor): self._event_names.append(QAPISchemaMember(name, ifcond)) =20 =20 -(input_file, output_dir, do_c, do_h, prefix, dummy) =3D parse_command_li= ne() +(input_file, output_dir, do_c, do_h, prefix, includes, dummy) =3D \ + parse_command_line() =20 c_comment =3D ''' /* @@ -218,13 +219,14 @@ fdef.write(mcgen(''' prefix=3Dprefix)) =20 fdecl.write(mcgen(''' +%(includes)s #include "qapi/error.h" #include "qapi/util.h" #include "qapi/qmp/qdict.h" #include "%(prefix)sqapi-types.h" =20 ''', - prefix=3Dprefix)) + includes=3Dincludes, prefix=3Dprefix)) =20 event_enum_name =3D c_name(prefix + 'QAPIEvent', protect=3DFalse) =20 diff --git a/scripts/qapi-introspect.py b/scripts/qapi-introspect.py index d6194ff702..f9abd83490 100644 --- a/scripts/qapi-introspect.py +++ b/scripts/qapi-introspect.py @@ -192,7 +192,7 @@ const QLitObject %(c_name)s =3D %(c_string)s; # We normally mask them, because they're not QMP wire ABI opt_unmask =3D False =20 -(input_file, output_dir, do_c, do_h, prefix, opts) =3D \ +(input_file, output_dir, do_c, do_h, prefix, includes, opts) =3D \ parse_command_line('u', ['unmask-non-abi-names']) =20 for o, a in opts: @@ -235,10 +235,11 @@ fdef.write(mcgen(''' prefix=3Dprefix)) =20 fdecl.write(mcgen(''' +%(includes)s #include "qemu/osdep.h" #include "qapi/qmp/qlit.h" =20 -''')) +''', includes=3Dincludes)) =20 schema =3D QAPISchema(input_file) gen =3D QAPISchemaGenIntrospectVisitor(opt_unmask) diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 312685c295..2b46a7e17f 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -266,7 +266,7 @@ class QAPISchemaGenTypeVisitor(QAPISchemaVisitor): # QAPISchemaGenTypeVisitor.visit_end(). do_builtins =3D False =20 -(input_file, output_dir, do_c, do_h, prefix, opts) =3D \ +(input_file, output_dir, do_c, do_h, prefix, includes, opts) =3D \ parse_command_line('b', ['builtins']) =20 for o, a in opts: @@ -317,7 +317,9 @@ fdef.write(mcgen(''' =20 fdecl.write(mcgen(''' #include "qapi/util.h" -''')) +%(includes)s +''', + includes=3Dincludes)) =20 schema =3D QAPISchema(input_file) gen =3D QAPISchemaGenTypeVisitor() diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index 369e1f927d..1e173d3cd7 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -338,7 +338,7 @@ class QAPISchemaGenVisitVisitor(QAPISchemaVisitor): # QAPISchemaGenVisitVisitor.visit_end(). do_builtins =3D False =20 -(input_file, output_dir, do_c, do_h, prefix, opts) =3D \ +(input_file, output_dir, do_c, do_h, prefix, includes, opts) =3D \ parse_command_line('b', ['builtins']) =20 for o, a in opts: @@ -387,12 +387,13 @@ fdef.write(mcgen(''' prefix=3Dprefix)) =20 fdecl.write(mcgen(''' +%(includes)s #include "qapi/visitor.h" #include "qapi/qmp/qerror.h" #include "%(prefix)sqapi-types.h" =20 ''', - prefix=3Dprefix)) + includes=3Dincludes, prefix=3Dprefix)) =20 schema =3D QAPISchema(input_file) gen =3D QAPISchemaGenVisitVisitor() --=20 2.14.1.146.gd35faa819