From nobody Sun Feb 8 14:45:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549477600657427.9426587949239; Wed, 6 Feb 2019 10:26:40 -0800 (PST) Received: from localhost ([127.0.0.1]:56801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grRu3-0002yq-NP for importer@patchew.org; Wed, 06 Feb 2019 13:26:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grRll-0004rK-Ge for qemu-devel@nongnu.org; Wed, 06 Feb 2019 13:17:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grRlh-00024q-N9 for qemu-devel@nongnu.org; Wed, 06 Feb 2019 13:17:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46076) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1grRlf-0001qF-Pn for qemu-devel@nongnu.org; Wed, 06 Feb 2019 13:17:53 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E3BB4474 for ; Wed, 6 Feb 2019 18:17:31 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-113.ams2.redhat.com [10.36.116.113]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 59C2018AAC; Wed, 6 Feb 2019 18:17:29 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C46201133056; Wed, 6 Feb 2019 19:17:25 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 6 Feb 2019 19:17:15 +0100 Message-Id: <20190206181725.14337-8-armbru@redhat.com> In-Reply-To: <20190206181725.14337-1-armbru@redhat.com> References: <20190206181725.14337-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 06 Feb 2019 18:17:31 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 07/17] qapi: New module target.json X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We can't add appropriate target-specific conditionals to misc.json, because that would make all of misc.json unusable in target-independent code. To keep misc.json target-independent, we need to split off target-dependent target.json. This commit doesn't actually split off anything, it merely creates the empty module. The next few patches will move stuff from misc.json there. Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau --- Makefile.objs | 20 +++++++++----------- Makefile.target | 10 ++++++++++ qapi/qapi-schema.json | 1 + qapi/target.json | 13 +++++++++++++ 4 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 qapi/target.json diff --git a/Makefile.objs b/Makefile.objs index 70ee51742f..5f0a7a8ca5 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -1,20 +1,19 @@ -QAPI_MODULES =3D block-core block char common crypto introspect job migrat= ion -QAPI_MODULES +=3D misc net rdma rocker run-state sockets tpm trace transac= tion -QAPI_MODULES +=3D ui +QAPI_COMMON_MODULES =3D block-core block char common crypto introspect +QAPI_COMMON_MODULES +=3D job migration misc net rdma rocker run-state +QAPI_COMMON_MODULES +=3D sockets tpm trace transaction ui +QAPI_TARGET_MODULES =3D target +QAPI_MODULES =3D $(QAPI_COMMON_MODULES) $(QAPI_TARGET_MODULES) =20 ####################################################################### # Common libraries for tools and emulators stub-obj-y =3D stubs/ crypto/ util-obj-y =3D util/ qobject/ qapi/ util-obj-y +=3D qapi/qapi-builtin-types.o -util-obj-y +=3D qapi/qapi-types.o -util-obj-y +=3D $(QAPI_MODULES:%=3Dqapi/qapi-types-%.o) +util-obj-y +=3D $(QAPI_COMMON_MODULES:%=3Dqapi/qapi-types-%.o) util-obj-y +=3D qapi/qapi-builtin-visit.o -util-obj-y +=3D qapi/qapi-visit.o -util-obj-y +=3D $(QAPI_MODULES:%=3Dqapi/qapi-visit-%.o) +util-obj-y +=3D $(QAPI_COMMON_MODULES:%=3Dqapi/qapi-visit-%.o) util-obj-y +=3D qapi/qapi-emit-events.o -util-obj-y +=3D qapi/qapi-events.o -util-obj-y +=3D $(QAPI_MODULES:%=3Dqapi/qapi-events-%.o) +util-obj-y +=3D $(QAPI_COMMON_MODULES:%=3Dqapi/qapi-events-%.o) =20 chardev-obj-y =3D chardev/ slirp-obj-$(CONFIG_SLIRP) =3D slirp/ @@ -92,8 +91,7 @@ common-obj-$(CONFIG_FDT) +=3D device_tree.o ###################################################################### # qapi =20 -common-obj-y +=3D qapi/qapi-commands.o -common-obj-y +=3D $(QAPI_MODULES:%=3Dqapi/qapi-commands-%.o) +common-obj-y +=3D $(QAPI_COMMON_MODULES:%=3Dqapi/qapi-commands-%.o) common-obj-y +=3D qmp.o hmp.o endif =20 diff --git a/Makefile.target b/Makefile.target index d8af835890..f908477040 100644 --- a/Makefile.target +++ b/Makefile.target @@ -164,6 +164,16 @@ endif =20 GENERATED_FILES +=3D hmp-commands.h hmp-commands-info.h =20 +# FIXME duplicates Makefile.obj's +QAPI_TARGET_MODULES =3D target +obj-y +=3D $(QAPI_TARGET_MODULES:%=3Dqapi/qapi-types-%.o) +obj-y +=3D qapi/qapi-types.o +obj-y +=3D $(QAPI_TARGET_MODULES:%=3Dqapi/qapi-visit-%.o) +obj-y +=3D qapi/qapi-visit.o +obj-y +=3D $(QAPI_TARGET_MODULES:%=3Dqapi/qapi-events-%.o) +obj-y +=3D qapi/qapi-events.o +obj-y +=3D $(QAPI_TARGET_MODULES:%=3Dqapi/qapi-commands-%.o) +obj-y +=3D qapi/qapi-commands.o obj-y +=3D qapi/qapi-introspect.o =20 endif # CONFIG_SOFTMMU diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json index 1845aa78ff..db61bfd688 100644 --- a/qapi/qapi-schema.json +++ b/qapi/qapi-schema.json @@ -97,3 +97,4 @@ { 'include': 'trace.json' } { 'include': 'introspect.json' } { 'include': 'misc.json' } +{ 'include': 'target.json' } diff --git a/qapi/target.json b/qapi/target.json new file mode 100644 index 0000000000..8054926293 --- /dev/null +++ b/qapi/target.json @@ -0,0 +1,13 @@ +# -*- Mode: Python -*- +# + +## +# =3D Target-specific commands & events +## + +## +# @TARGET-TEMPORARY-DUMMY: +# Will go away in the next commit. Needed in this one because empty +# modules don't generate anything, defeating this commit's purpose. +## +{ 'event': 'TARGET-TEMPORARY-DUMMY' } --=20 2.17.2