From nobody Fri Nov 7 02:09:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1545162802560361.3563545509288; Tue, 18 Dec 2018 11:53:22 -0800 (PST) Received: from localhost ([::1]:55756 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZK5k-0008GD-J5 for importer@patchew.org; Tue, 18 Dec 2018 13:27:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZK16-0003dL-Le for qemu-devel@nongnu.org; Tue, 18 Dec 2018 13:22:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZK13-0002jU-TN for qemu-devel@nongnu.org; Tue, 18 Dec 2018 13:22:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52532) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gZK13-0002QW-Am for qemu-devel@nongnu.org; Tue, 18 Dec 2018 13:22:49 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6DC3E5A1EC for ; Tue, 18 Dec 2018 18:22:43 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E980E4D722; Tue, 18 Dec 2018 18:22:40 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0EF051138406; Tue, 18 Dec 2018 19:22:35 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 18 Dec 2018 19:22:24 +0100 Message-Id: <20181218182234.28876-6-armbru@redhat.com> In-Reply-To: <20181218182234.28876-1-armbru@redhat.com> References: <20181218182234.28876-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 18 Dec 2018 18:22:43 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH v2 05/15] 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 --- Makefile.objs | 19 +++++++++---------- Makefile.target | 10 ++++++++++ qapi/qapi-schema.json | 1 + qapi/target.json | 13 +++++++++++++ 4 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 qapi/target.json diff --git a/Makefile.objs b/Makefile.objs index 93dc86f2e6..b7d46083e7 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -1,19 +1,19 @@ -QAPI_MODULES =3D block-core block char common crypto introspect job migrat= ion -QAPI_MODULES +=3D misc net rocker run-state sockets tpm trace transaction = ui +QAPI_COMMON_MODULES =3D block-core block char common crypto introspect +QAPI_COMMON_MODULES +=3D job migration misc net rocker run-state sockets +QAPI_COMMON_MODULES +=3D 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-events-FIXME.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/ =20 @@ -92,8 +92,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 c882292ae1..7884fca2be 100644 --- a/Makefile.target +++ b/Makefile.target @@ -156,6 +156,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 65b6dc2f6f..4a836d6c9f 100644 --- a/qapi/qapi-schema.json +++ b/qapi/qapi-schema.json @@ -94,3 +94,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