From nobody Fri Apr 4 21:12:24 2025 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=1739902942; cv=none; d=zohomail.com; s=zohoarc; b=NKoIGON4EI/xMsf/mFet2BQW/N/uEzVY+8hUrleUFieFsiiA8vBOtaT2gXY7QRU1pyvCMOssqRgCKYshd7YNFadiosbEGAQ2obNGjn+jOOPL3x/38mAQV2+X6KUnXSwwAgVzBNofZMT2h23nMvqJ638lJPnuWsNoUus6IQ/5Y4k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1739902942; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+2s55xY4xuFkJaQb7IgaHFsyT2GfktWanOz++TYX8qQ=; b=YmimKMwXO+CWKOJnbb2RLr0yzAWZx82TX3eeyxNJpF0iMF21IAfmMEh6gMgY39QwsSrypWJrXvIxz0EFfrbHmwOdW7hc5eXsa0F97iiGj3ZXdA/XjbfVPE6TTemNxdBoG9eapzAZnodIyQVsqCDeWNhwQQ50BQwzltA8Ik6PbqU= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1739902942950127.89446824224831; Tue, 18 Feb 2025 10:22:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkSDI-0005xh-3r; Tue, 18 Feb 2025 13:20:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tkSD4-0005un-Uw for qemu-devel@nongnu.org; Tue, 18 Feb 2025 13:20:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tkSD1-0007Xb-Mr for qemu-devel@nongnu.org; Tue, 18 Feb 2025 13:20:42 -0500 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-32-9hzx_4JWNKG0utQAxabvoA-1; Tue, 18 Feb 2025 13:20:36 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C4F4719039C2; Tue, 18 Feb 2025 18:20:34 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.45.226.66]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 47FA11800358; Tue, 18 Feb 2025 18:20:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739902839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+2s55xY4xuFkJaQb7IgaHFsyT2GfktWanOz++TYX8qQ=; b=KKjD/tVcqzEaTnlZ7knr83RNtYYyKfy1cDHpznA+uGj2Qo5h5qstIVLc8V/F0Ux6+vr5Ao jbQC+v2/pxNk7SS6gMlmAxP+YTtcTqxy+LeJVeSAnwPF/rSULGCClvKbV6vuU0tYMlVbrA 9wVI69Yx2uzoUCSBN3vwL+vMsHmjYQQ= X-MC-Unique: 9hzx_4JWNKG0utQAxabvoA-1 X-Mimecast-MFC-AGG-ID: 9hzx_4JWNKG0utQAxabvoA_1739902835 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, pbonzini@redhat.com, manos.pitsidianakis@linaro.org, philmd@linaro.org, qemu-devel@nongnu.org, qemu-rust@nongnu.org Subject: [PATCH v2 02/11] meson: Add rust_block_ss and link tools with it Date: Tue, 18 Feb 2025 19:20:10 +0100 Message-ID: <20250218182019.111467-3-kwolf@redhat.com> In-Reply-To: <20250218182019.111467-1-kwolf@redhat.com> References: <20250218182019.111467-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=170.10.133.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.423, 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_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1739902944100019000 Content-Type: text/plain; charset="utf-8" Signed-off-by: Kevin Wolf --- meson.build | 36 ++++++++++++++++++++++++++++++++---- storage-daemon/meson.build | 2 +- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 6ee1757828..a08d029032 100644 --- a/meson.build +++ b/meson.build @@ -3640,6 +3640,7 @@ qom_ss =3D ss.source_set() system_ss =3D ss.source_set() specific_fuzz_ss =3D ss.source_set() specific_ss =3D ss.source_set() +rust_block_ss =3D ss.source_set() rust_devices_ss =3D ss.source_set() stub_ss =3D ss.source_set() trace_ss =3D ss.source_set() @@ -4217,7 +4218,11 @@ foreach target : target_dirs arch_deps +=3D target_specific.dependencies() =20 if have_rust and target_type =3D=3D 'system' - target_rust =3D rust_devices_ss.apply(config_target, strict: false) + target_rust_ss =3D ss.source_set() + target_rust_ss.add_all(rust_block_ss) + target_rust_ss.add_all(rust_devices_ss) + + target_rust =3D target_rust_ss.apply(config_target, strict: false) crates =3D [] foreach dep : target_rust.dependencies() crates +=3D dep.get_variable('crate') @@ -4357,15 +4362,38 @@ if xkbcommon.found() endif =20 if have_tools + tools_deps =3D [] + if have_rust + tools_rust =3D rust_block_ss.apply({}) + crates =3D [] + foreach dep : tools_rust.dependencies() + crates +=3D dep.get_variable('crate') + endforeach + if crates.length() > 0 + rlib_rs =3D custom_target('rust_tools.rs', + output: 'rust_tools.rs', + command: [rust_root_crate, crates], + capture: true, + build_by_default: true, + build_always_stale: true) + rlib =3D static_library('rust_tools', + rlib_rs, + dependencies: tools_rust.dependencies(), + override_options: ['rust_std=3D2021', 'build.r= ust_std=3D2021'], + rust_abi: 'c') + tools_deps +=3D declare_dependency(link_whole: [rlib]) + endif + endif + qemu_img =3D executable('qemu-img', [files('qemu-img.c'), hxdep], link_args: '@block.syms', link_depends: block_syms, - dependencies: [authz, block, crypto, io, qom, qemuutil], inst= all: true) + dependencies: tools_deps + [authz, block, crypto, io, qom, qe= muutil], install: true) qemu_io =3D executable('qemu-io', files('qemu-io.c'), link_args: '@block.syms', link_depends: block_syms, - dependencies: [block, qemuutil], install: true) + dependencies: tools_deps + [block, qemuutil], install: true) qemu_nbd =3D executable('qemu-nbd', files('qemu-nbd.c'), link_args: '@block.syms', link_depends: block_syms, - dependencies: [blockdev, qemuutil, selinux], + dependencies: tools_deps + [blockdev, qemuutil, selinux], install: true) =20 subdir('storage-daemon') diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build index 5e61a9d1bd..92bc2e0cba 100644 --- a/storage-daemon/meson.build +++ b/storage-daemon/meson.build @@ -9,6 +9,6 @@ if have_tools qsd =3D executable('qemu-storage-daemon', qsd_ss.sources(), link_args: '@block.syms', link_depends: block_syms, - dependencies: qsd_ss.dependencies(), + dependencies: tools_deps + qsd_ss.dependencies(), install: true) endif --=20 2.48.1