{"id":812341,"url":"http://patchwork.ozlabs.org/api/patches/812341/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-45-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-45-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-11T11:06:17","name":"[v3,44/50] build-sys: add a target schema","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2ed02f86e7adbe8a7d0c76a908102a6c523afa05","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-45-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/812341/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812341/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-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx09.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 3xrQdL0ljSz9sNV\n\tfor ;\n\tMon, 11 Sep 2017 21:27:34 +1000 (AEST)","from localhost ([::1]:56830 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drMsG-0006Ko-2A\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 07:27:32 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:43724)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drMZu-0006ic-05\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:35 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drMZs-0007JD-LP\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:33 -0400","from mx1.redhat.com ([209.132.183.28]:50762)\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 1drMZs-0007Iv-CY\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:32 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\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 8A402231E04\n\tfor ; Mon, 11 Sep 2017 11:08:31 +0000 (UTC)","from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 05FD06EC9A;\n\tMon, 11 Sep 2017 11:08:28 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 8A402231E04","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Mon, 11 Sep 2017 13:06:17 +0200","Message-Id":"<20170911110623.24981-45-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.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tMon, 11 Sep 2017 11:08:31 +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 44/50] build-sys: add a target schema","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, \"Dr. David Alan Gilbert\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"This schema is going to contain target-specific commands/events &\ntypes, that can be conditionnally guarded with poisoned defines. To\nfilter it out by default, set the unit name to 'target'.\n\nAnd new rules to compile this unit generated files per-target.\n\nUse the \"-u all\" options for the introspection schema, since it is\ngenerated as a single file and must contain all definitions.\n\nSigned-off-by: Marc-André Lureau \n---\n qapi-schema.json | 1 +\n qapi/target.json | 3 +++\n monitor.c | 2 ++\n Makefile | 29 ++++++++++++++++++++++++++++-\n Makefile.target | 2 ++\n 5 files changed, 36 insertions(+), 1 deletion(-)\n create mode 100644 qapi/target.json","diff":"diff --git a/qapi-schema.json b/qapi-schema.json\nindex f3af2cb851..42b6aebddb 100644\n--- a/qapi-schema.json\n+++ b/qapi-schema.json\n@@ -92,6 +92,7 @@\n { 'include': 'qapi/transaction.json' }\n { 'include': 'qapi/trace.json' }\n { 'include': 'qapi/introspect.json' }\n+{ 'include': 'qapi/target.json' }\n \n ##\n # = Miscellanea\ndiff --git a/qapi/target.json b/qapi/target.json\nnew file mode 100644\nindex 0000000000..e9644f52c2\n--- /dev/null\n+++ b/qapi/target.json\n@@ -0,0 +1,3 @@\n+# -*- Mode: Python -*-\n+\n+{ 'pragma': { 'unit': 'target' } }\ndiff --git a/monitor.c b/monitor.c\nindex bf8a7685bf..af4eaeca5e 100644\n--- a/monitor.c\n+++ b/monitor.c\n@@ -68,6 +68,7 @@\n #include \"exec/exec-all.h\"\n #include \"qemu/log.h\"\n #include \"qmp-commands.h\"\n+#include \"target-qmp-commands.h\"\n #include \"hmp.h\"\n #include \"qemu/thread.h\"\n #include \"block/qapi.h\"\n@@ -1003,6 +1004,7 @@ void monitor_init_qmp_commands(void)\n \n QTAILQ_INIT(&qmp_commands);\n qmp_init_marshal(&qmp_commands);\n+ target_qmp_init_marshal(&qmp_commands);\n \n qmp_register_command(&qmp_commands, \"query-qmp-schema\",\n qmp_query_qmp_schema,\ndiff --git a/Makefile b/Makefile\nindex 337a1f6f9b..7356b4e7b7 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -54,6 +54,8 @@ include $(SRC_PATH)/rules.mak\n GENERATED_FILES = qemu-version.h config-host.h qemu-options.def\n GENERATED_FILES += qmp-commands.h qapi-types.h qapi-visit.h qapi-event.h\n GENERATED_FILES += qmp-marshal.c qapi-types.c qapi-visit.c qapi-event.c\n+GENERATED_FILES += target-qmp-commands.h target-qapi-types.h target-qapi-visit.h target-qapi-event.h\n+GENERATED_FILES += target-qmp-marshal.c target-qapi-types.c target-qapi-visit.c target-qapi-event.c\n GENERATED_FILES += qmp-introspect.h\n GENERATED_FILES += qmp-introspect.c\n \n@@ -418,6 +420,7 @@ qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \\\n $(SRC_PATH)/qapi/rocker.json \\\n $(SRC_PATH)/qapi/run-state.json \\\n $(SRC_PATH)/qapi/sockets.json \\\n+ $(SRC_PATH)/qapi/target.json \\\n $(SRC_PATH)/qapi/tpm.json \\\n $(SRC_PATH)/qapi/trace.json \\\n $(SRC_PATH)/qapi/transaction.json \\\n@@ -443,10 +446,34 @@ $(qapi-modules) $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)\n \t$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \\\n \t\t$(gen-out-type) -o \".\" $<, \\\n \t\t\"GEN\",\"$@\")\n+\n+target-qapi-types.c target-qapi-types.h :\\\n+$(qapi-modules) $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)\n+\t$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \\\n+\t\t-i qapi-types.h \\\n+\t\t$(gen-out-type) -p target- -u target $<, \\\n+\t\t\"GEN\",\"$@\")\n+target-qapi-visit.c target-qapi-visit.h :\\\n+$(qapi-modules) $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)\n+\t$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \\\n+\t\t-i qapi-visit.h \\\n+\t\t$(gen-out-type) -p target- -u target $<, \\\n+\t\t\"GEN\",\"$@\")\n+target-qapi-event.c target-qapi-event.h :\\\n+$(qapi-modules) $(SRC_PATH)/scripts/qapi-event.py $(qapi-py)\n+\t$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-event.py \\\n+\t\t$(gen-out-type) -p target- -u target $<, \\\n+\t\t\"GEN\",\"$@\")\n+target-qmp-commands.h target-qmp-marshal.c :\\\n+$(qapi-modules) $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)\n+\t$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \\\n+\t\t$(gen-out-type) -p target- -u target $<, \\\n+\t\t\"GEN\",\"$@\")\n+\n qmp-introspect.h qmp-introspect.c :\\\n $(qapi-modules) $(SRC_PATH)/scripts/qapi-introspect.py $(qapi-py)\n \t$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-introspect.py \\\n-\t\t$(gen-out-type) -o \".\" $<, \\\n+\t\t$(gen-out-type) -o \".\" -u all $<, \\\n \t\t\"GEN\",\"$@\")\n \n QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)\ndiff --git a/Makefile.target b/Makefile.target\nindex 0d28ed1df0..e44a3847d3 100644\n--- a/Makefile.target\n+++ b/Makefile.target\n@@ -157,6 +157,8 @@ endif\n \n GENERATED_FILES += hmp-commands.h hmp-commands-info.h\n \n+obj-y += target-qapi-types.o target-qapi-visit.o\n+obj-y += target-qapi-event.o target-qmp-marshal.o\n obj-y += qmp-introspect.o\n \n endif # CONFIG_SOFTMMU\n","prefixes":["v3","44/50"]}