{"id":812353,"url":"http://patchwork.ozlabs.org/api/patches/812353/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-41-marcandre.lureau@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170911110623.24981-41-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-11T11:06:13","name":"[v3,40/50] qapi: add -i/--include filename.h","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"9d6ca3154f8e3de346efbbaeffda74a4dc056fc8","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-41-marcandre.lureau@redhat.com/mbox/","series":[{"id":2480,"url":"http://patchwork.ozlabs.org/api/series/2480/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2480","date":"2017-09-11T11:05:33","name":"Hi,","version":3,"mbox":"http://patchwork.ozlabs.org/series/2480/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/812353/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812353/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=marcandre.lureau@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xrQsw0sh0z9sBd\n\tfor ;\n\tMon, 11 Sep 2017 21:38:28 +1000 (AEST)","from localhost ([::1]:56890 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drN2o-0007Pf-5t\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 07:38:26 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:43645)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drMZh-0006XR-Kq\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:28 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drMZg-0007BQ-4R\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:21 -0400","from mx1.redhat.com ([209.132.183.28]:56850)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1drMZf-0007AQ-Sc\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:20 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 092591A2263;\n\tMon, 11 Sep 2017 11:08:19 +0000 (UTC)","from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 947496442B;\n\tMon, 11 Sep 2017 11:08:18 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 092591A2263","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","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","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tMon, 11 Sep 2017 11:08:19 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v3 40/50] qapi: add -i/--include filename.h","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n\tarmbru@redhat.com, Michael Roth ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Add a new option to add user-specified #include lines in the generated\nheaders. This will help to split a schema, where one generated header\nwill depend on another.\n\nSigned-off-by: Marc-André Lureau \n---\n scripts/qapi.py | 13 +++++++++----\n scripts/qapi-commands.py | 7 +++++--\n scripts/qapi-event.py | 6 ++++--\n scripts/qapi-introspect.py | 5 +++--\n scripts/qapi-types.py | 6 ++++--\n scripts/qapi-visit.py | 5 +++--\n 6 files changed, 28 insertions(+), 14 deletions(-)","diff":"diff --git a/scripts/qapi.py b/scripts/qapi.py\nindex 19e48bd4d2..eb4ffdc06d 100644\n--- a/scripts/qapi.py\n+++ b/scripts/qapi.py\n@@ -2096,9 +2096,9 @@ def parse_command_line(extra_options='', extra_long_options=[]):\n \n try:\n opts, args = getopt.gnu_getopt(sys.argv[1:],\n- 'chp:o:' + extra_options,\n- ['source', 'header', 'prefix=',\n- 'output-dir='] + extra_long_options)\n+ 'chp:o:i:' + extra_options,\n+ ['source', 'header', 'prefix=', 'output-dir=',\n+ 'include='] + extra_long_options)\n except getopt.GetoptError as err:\n print >>sys.stderr, \"%s: %s\" % (sys.argv[0], str(err))\n sys.exit(1)\n@@ -2107,6 +2107,7 @@ def parse_command_line(extra_options='', extra_long_options=[]):\n prefix = ''\n do_c = False\n do_h = False\n+ includes = []\n extra_opts = []\n \n for oa in opts:\n@@ -2125,6 +2126,8 @@ def parse_command_line(extra_options='', extra_long_options=[]):\n do_c = True\n elif o in ('-h', '--header'):\n do_h = True\n+ elif o in ('-i', '--include'):\n+ includes.append(a)\n else:\n extra_opts.append(oa)\n \n@@ -2137,7 +2140,9 @@ def parse_command_line(extra_options='', extra_long_options=[]):\n sys.exit(1)\n fname = args[0]\n \n- return (fname, output_dir, do_c, do_h, prefix, extra_opts)\n+ includes = \"\\n\".join(['#include \"%s\"' % inc for inc in includes])\n+\n+ return (fname, output_dir, do_c, do_h, prefix, includes, extra_opts)\n \n #\n # Generate output files with boilerplate\ndiff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py\nindex 7455d2b8bb..4841f4d9a1 100644\n--- a/scripts/qapi-commands.py\n+++ b/scripts/qapi-commands.py\n@@ -253,7 +253,8 @@ class QAPISchemaGenCommandVisitor(QAPISchemaVisitor):\n self._regy += gen_register_command(name, success_response)\n \n \n-(input_file, output_dir, do_c, do_h, prefix, opts) = parse_command_line()\n+(input_file, output_dir, do_c, do_h, prefix, includes, opts) = \\\n+ parse_command_line()\n \n c_comment = '''\n /*\n@@ -305,6 +306,7 @@ fdef.write(mcgen('''\n prefix=prefix))\n \n fdecl.write(mcgen('''\n+%(includes)s\n #include \"%(prefix)sqapi-types.h\"\n #include \"qapi/qmp/qdict.h\"\n #include \"qapi/qmp/dispatch.h\"\n@@ -312,7 +314,8 @@ fdecl.write(mcgen('''\n \n void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds);\n ''',\n- prefix=prefix, c_prefix=c_name(prefix, protect=False)))\n+ includes=includes, prefix=prefix,\n+ c_prefix=c_name(prefix, protect=False)))\n \n schema = QAPISchema(input_file)\n gen = QAPISchemaGenCommandVisitor()\ndiff --git a/scripts/qapi-event.py b/scripts/qapi-event.py\nindex 60c6f7030d..0aba866dc8 100644\n--- a/scripts/qapi-event.py\n+++ b/scripts/qapi-event.py\n@@ -171,7 +171,8 @@ class QAPISchemaGenEventVisitor(QAPISchemaVisitor):\n self._event_names.append(QAPISchemaMember(name, ifcond))\n \n \n-(input_file, output_dir, do_c, do_h, prefix, dummy) = parse_command_line()\n+(input_file, output_dir, do_c, do_h, prefix, includes, dummy) = \\\n+ parse_command_line()\n \n c_comment = '''\n /*\n@@ -218,13 +219,14 @@ fdef.write(mcgen('''\n prefix=prefix))\n \n fdecl.write(mcgen('''\n+%(includes)s\n #include \"qapi/error.h\"\n #include \"qapi/util.h\"\n #include \"qapi/qmp/qdict.h\"\n #include \"%(prefix)sqapi-types.h\"\n \n ''',\n- prefix=prefix))\n+ includes=includes, prefix=prefix))\n \n event_enum_name = c_name(prefix + 'QAPIEvent', protect=False)\n \ndiff --git a/scripts/qapi-introspect.py b/scripts/qapi-introspect.py\nindex d6194ff702..f9abd83490 100644\n--- a/scripts/qapi-introspect.py\n+++ b/scripts/qapi-introspect.py\n@@ -192,7 +192,7 @@ const QLitObject %(c_name)s = %(c_string)s;\n # We normally mask them, because they're not QMP wire ABI\n opt_unmask = False\n \n-(input_file, output_dir, do_c, do_h, prefix, opts) = \\\n+(input_file, output_dir, do_c, do_h, prefix, includes, opts) = \\\n parse_command_line('u', ['unmask-non-abi-names'])\n \n for o, a in opts:\n@@ -235,10 +235,11 @@ fdef.write(mcgen('''\n prefix=prefix))\n \n fdecl.write(mcgen('''\n+%(includes)s\n #include \"qemu/osdep.h\"\n #include \"qapi/qmp/qlit.h\"\n \n-'''))\n+''', includes=includes))\n \n schema = QAPISchema(input_file)\n gen = QAPISchemaGenIntrospectVisitor(opt_unmask)\ndiff --git a/scripts/qapi-types.py b/scripts/qapi-types.py\nindex 312685c295..2b46a7e17f 100644\n--- a/scripts/qapi-types.py\n+++ b/scripts/qapi-types.py\n@@ -266,7 +266,7 @@ class QAPISchemaGenTypeVisitor(QAPISchemaVisitor):\n # QAPISchemaGenTypeVisitor.visit_end().\n do_builtins = False\n \n-(input_file, output_dir, do_c, do_h, prefix, opts) = \\\n+(input_file, output_dir, do_c, do_h, prefix, includes, opts) = \\\n parse_command_line('b', ['builtins'])\n \n for o, a in opts:\n@@ -317,7 +317,9 @@ fdef.write(mcgen('''\n \n fdecl.write(mcgen('''\n #include \"qapi/util.h\"\n-'''))\n+%(includes)s\n+''',\n+ includes=includes))\n \n schema = QAPISchema(input_file)\n gen = QAPISchemaGenTypeVisitor()\ndiff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py\nindex 369e1f927d..1e173d3cd7 100644\n--- a/scripts/qapi-visit.py\n+++ b/scripts/qapi-visit.py\n@@ -338,7 +338,7 @@ class QAPISchemaGenVisitVisitor(QAPISchemaVisitor):\n # QAPISchemaGenVisitVisitor.visit_end().\n do_builtins = False\n \n-(input_file, output_dir, do_c, do_h, prefix, opts) = \\\n+(input_file, output_dir, do_c, do_h, prefix, includes, opts) = \\\n parse_command_line('b', ['builtins'])\n \n for o, a in opts:\n@@ -387,12 +387,13 @@ fdef.write(mcgen('''\n prefix=prefix))\n \n fdecl.write(mcgen('''\n+%(includes)s\n #include \"qapi/visitor.h\"\n #include \"qapi/qmp/qerror.h\"\n #include \"%(prefix)sqapi-types.h\"\n \n ''',\n- prefix=prefix))\n+ includes=includes, prefix=prefix))\n \n schema = QAPISchema(input_file)\n gen = QAPISchemaGenVisitVisitor()\n","prefixes":["v3","40/50"]}