From nobody Tue Feb 10 01:59:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596743525; cv=none; d=zohomail.com; s=zohoarc; b=ipQA+U/xPDvxexVABJ+CqfDsmUTe+Er9YUQrzFJM27MU2odCKqsFmbmTAmeUjFaCzN+zfSzVgGFVbL8JxEcidosaWrOjTzzSainOxYDd831ZL4jCBHik4a2klveScmwo4zw3i2QVsZIgYp7gPgUSX4/uv3h7x3ceWMkzLCKSjsQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596743525; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0UaVS/O2UMjZawLBSRCIvq5m68pmtVNluuu280xtuVY=; b=mK7HIKERHGNugASFDRcZlyZubQrOMzV7XjIwDxF6LRGxqOLbjE2JLfRj/j0V3tfJ56WdmByOAVeFvFZM1zvi4+W+5cl3gJuSXBsJoOObsYWMeLDmKK0PrUEAtv8LztidP4tg4v2muwBZfcXzwZNxTmwc7AdjlqXzoY59Z64gPfM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1596743525142626.0569925934242; Thu, 6 Aug 2020 12:52:05 -0700 (PDT) Received: from localhost ([::1]:35456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3lvn-0000tW-SI for importer@patchew.org; Thu, 06 Aug 2020 15:52:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3lPa-0007WU-P0 for qemu-devel@nongnu.org; Thu, 06 Aug 2020 15:18:46 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:27128 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k3lPY-0006g5-S0 for qemu-devel@nongnu.org; Thu, 06 Aug 2020 15:18:46 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-71-z4uI4Aa0MfWGYVNcl9lKCA-1; Thu, 06 Aug 2020 15:18:42 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id BB9E41800D42 for ; Thu, 6 Aug 2020 19:18:41 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id CBF0C5F9DC; Thu, 6 Aug 2020 19:18:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596741524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0UaVS/O2UMjZawLBSRCIvq5m68pmtVNluuu280xtuVY=; b=fC7C+FXtIGxlFIGwqFV1I/Dx4tzEWLT26qWePINvbxHljxbJoBxi67xhZk086SGs9axWnq N+QIM3uW9swRcPSWNZw90f06rOdCKw0fBsep0JjXTFATJIgD75dFzmwKjv3cJhO04RZu7+ FQFyK52AKxC4SgrnCsIjqgHBG91Hpx8= X-MC-Unique: z4uI4Aa0MfWGYVNcl9lKCA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 080/143] meson: convert qapi-specific to meson Date: Thu, 6 Aug 2020 21:15:16 +0200 Message-Id: <1596741379-12902-81-git-send-email-pbonzini@redhat.com> In-Reply-To: <1596741379-12902-1-git-send-email-pbonzini@redhat.com> References: <1596741379-12902-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/06 03:10:56 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 2 -- Makefile.target | 1 - qapi/Makefile.objs | 15 --------------- qapi/meson.build | 10 +++++++--- 4 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 qapi/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index 4959d62..965f64c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -63,8 +63,6 @@ common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += =3D block-dmg-bz2$(DSOSUF common-obj-y +=3D hw/ common-obj-m +=3D hw/ =20 -common-obj-y +=3D qapi/ - common-obj-y +=3D libqmp.fa =20 endif # CONFIG_SOFTMMU diff --git a/Makefile.target b/Makefile.target index bf3fda9..386378b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -157,7 +157,6 @@ ifdef CONFIG_SOFTMMU obj-y +=3D softmmu/ obj-y +=3D gdbstub.o obj-y +=3D hw/ -obj-y +=3D qapi/ LIBS :=3D $(libs_softmmu) $(LIBS) =20 # Temporary until emulators are linked by Meson diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs deleted file mode 100644 index c0a31be..0000000 --- a/qapi/Makefile.objs +++ /dev/null @@ -1,15 +0,0 @@ -QAPI_TARGET_MODULES =3D machine-target misc-target - -obj-y =3D qapi-introspect.o -obj-y +=3D $(QAPI_TARGET_MODULES:%=3Dqapi-types-%.o) -obj-y +=3D qapi-types.o -obj-y +=3D $(QAPI_TARGET_MODULES:%=3Dqapi-visit-%.o) -obj-y +=3D qapi-visit.o -obj-y +=3D $(QAPI_TARGET_MODULES:%=3Dqapi-events-%.o) -obj-y +=3D qapi-events.o -obj-y +=3D $(QAPI_TARGET_MODULES:%=3Dqapi-commands-%.o) -obj-y +=3D qapi-commands.o -obj-y +=3D qapi-init-commands.o - -QAPI_MODULES_STORAGE_DAEMON =3D block-core char common control crypto -QAPI_MODULES_STORAGE_DAEMON +=3D introspect job qom sockets pragma transac= tion diff --git a/qapi/meson.build b/qapi/meson.build index 51d11ce..de5b16f 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -113,8 +113,12 @@ foreach output : qapi_util_outputs i =3D i + 1 endforeach =20 -# These are still handled by the Makefile -i +=3D qapi_nonmodule_outputs.length() -i +=3D qapi_specific_outputs.length() +foreach output : qapi_specific_outputs + qapi_nonmodule_outputs + if output.endswith('.h') + genh +=3D qapi_files[i] + endif + specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: qapi_files[i]) + i =3D i + 1 +endforeach =20 qapi_doc_texi =3D qapi_files[i] --=20 1.8.3.1