From patchwork Thu Feb 14 15:22:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 1042236 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 440gCq1N1Cz9sN8 for ; Fri, 15 Feb 2019 02:24:07 +1100 (AEDT) Received: from localhost ([127.0.0.1]:50145 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guIrt-0007c9-4j for incoming@patchwork.ozlabs.org; Thu, 14 Feb 2019 10:24:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guIqu-0007ZO-P5 for qemu-devel@nongnu.org; Thu, 14 Feb 2019 10:23:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guIqr-0001Z3-Qw for qemu-devel@nongnu.org; Thu, 14 Feb 2019 10:23:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41056) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1guIqq-0001Uj-Cy for qemu-devel@nongnu.org; Thu, 14 Feb 2019 10:23:01 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E9AEEC057842 for ; Thu, 14 Feb 2019 15:22:58 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-92.ams2.redhat.com [10.36.116.92]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DD46E607C3; Thu, 14 Feb 2019 15:22:57 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 80A01113305C; Thu, 14 Feb 2019 16:22:51 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 14 Feb 2019 16:22:41 +0100 Message-Id: <20190214152251.2073-9-armbru@redhat.com> In-Reply-To: <20190214152251.2073-1-armbru@redhat.com> References: <20190214152251.2073-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 14 Feb 2019 15:22:59 +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 v5 08/18] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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é Lureau --- qapi/Makefile.objs | 28 +++++++++++++++++----------- qapi/qapi-schema.json | 1 + qapi/target.json | 13 +++++++++++++ 3 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 qapi/target.json diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs index 05bb0564f2..87e4df1660 100644 --- a/qapi/Makefile.objs +++ b/qapi/Makefile.objs @@ -5,21 +5,27 @@ util-obj-y += opts-visitor.o qapi-clone-visitor.o util-obj-y += qmp-event.o util-obj-y += qapi-util.o -QAPI_MODULES = block-core block char common crypto introspect job migration -QAPI_MODULES += misc net rdma rocker run-state sockets tpm trace transaction -QAPI_MODULES += ui +QAPI_COMMON_MODULES = block-core block char common crypto introspect +QAPI_COMMON_MODULES += job migration misc net rdma rocker run-state +QAPI_COMMON_MODULES += sockets tpm trace transaction ui +QAPI_TARGET_MODULES = target +QAPI_MODULES = $(QAPI_COMMON_MODULES) $(QAPI_TARGET_MODULES) util-obj-y += qapi-builtin-types.o -util-obj-y += qapi-types.o -util-obj-y += $(QAPI_MODULES:%=qapi-types-%.o) +util-obj-y += $(QAPI_COMMON_MODULES:%=qapi-types-%.o) util-obj-y += qapi-builtin-visit.o -util-obj-y += qapi-visit.o -util-obj-y += $(QAPI_MODULES:%=qapi-visit-%.o) +util-obj-y += $(QAPI_COMMON_MODULES:%=qapi-visit-%.o) util-obj-y += qapi-emit-events.o -util-obj-y += qapi-events.o -util-obj-y += $(QAPI_MODULES:%=qapi-events-%.o) +util-obj-y += $(QAPI_COMMON_MODULES:%=qapi-events-%.o) -common-obj-y = qapi-commands.o -common-obj-y += $(QAPI_MODULES:%=qapi-commands-%.o) +common-obj-y = $(QAPI_COMMON_MODULES:%=qapi-commands-%.o) obj-y = qapi-introspect.o +obj-y += $(QAPI_TARGET_MODULES:%=qapi-types-%.o) +obj-y += qapi-types.o +obj-y += $(QAPI_TARGET_MODULES:%=qapi-visit-%.o) +obj-y += qapi-visit.o +obj-y += $(QAPI_TARGET_MODULES:%=qapi-events-%.o) +obj-y += qapi-events.o +obj-y += $(QAPI_TARGET_MODULES:%=qapi-commands-%.o) +obj-y += qapi-commands.o 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 -*- +# + +## +# = 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' }