From nobody Sat Oct 4 20:33:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601988999; cv=none; d=zohomail.com; s=zohoarc; b=DXc4AOt49fuiBAA3z0DspuMUvRVRM4K89oLYb1WT4sdJqnwyRaTEaag026iMhAO1udkF72YYoaUw9lGRM9IhngzGhb3mZ6Vo3/dsh2pfeTGG1J3V1IJhFvJHSnCdnT+tHkxvBMEyv923WvyVnJqTXYGDXo/hsvoH4C6yoG6pT/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601988999; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=uo2CBkWFfKQfoIhaUjbFZ5zVf7ry84pgNlp78mZ6R2E=; b=UmDT/N28Xk7QGW/MydjtUSWUBKXSRUeSrzSSzAye7b+/lNNVnO3CKsxAJ61yeVfqSqh2OPFDtNXpW2F18p2AwvELZyfxRDRqA3OxP34wtx0OsyNSGZQIn2dvH1GRIycFSVnTv1d/NI1otE1UVEqR1IIL3K1zm50WjteDpU9btes= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1601988999490730.2341271146491; Tue, 6 Oct 2020 05:56:39 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-497-wXm0-s-iOwCv-NYKOGW86g-1; Tue, 06 Oct 2020 08:56:36 -0400 Received: by mail-wr1-f69.google.com with SMTP id 47so3041798wrc.19 for ; Tue, 06 Oct 2020 05:56:36 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id h17sm4772675wro.27.2020.10.06.05.56.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601988998; 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=uo2CBkWFfKQfoIhaUjbFZ5zVf7ry84pgNlp78mZ6R2E=; b=CEUGqojK9I7pHwqKoQ1/5QawSD7k2yhomhEBGCBL+/isX1z3b/qqh+TlXm7L77qT5tR8E9 1V9ZvptRUSFqHy/t1yk+AxbQDz3PtHxKiS265KKJXIcaIsakwhTa628dPCVU8FdJqT/R4h 0YyHJ7mb79Su11mW8mKSt2Oa19kJGFc= X-MC-Unique: wXm0-s-iOwCv-NYKOGW86g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uo2CBkWFfKQfoIhaUjbFZ5zVf7ry84pgNlp78mZ6R2E=; b=Su/t23JhcCoYsbSJwULO8Q281IGMBB/C/IxIKK+IZWFvTbOdG2LHesVpMhqUxuDfre vmPDGZnd9u+1I7kDy/nZ4webELxczUchHPPOEhdwXMOHJBPGw4ZFNJv1GyO8X/jTKPOi qaYxOmEsnXbgF46qO4gUEOyIu0NOYx04b7NIEip3z97RFLuxc6K2jcMCi4q5LKRxdqP3 xxM0FTNnvIOuZKNfbzJs5Wilxfw43lZ29MUubGHgSoRG/gYS+xV7nVsJfr9m5fK+kstI r3Yrg9BtLH351EAEojcfK2CyurR23qeIQ5iDG3miVYKpawOPO+GSewdgkWdfhSCRZ3gu vdTQ== X-Gm-Message-State: AOAM5336DRWu7CwlcKKvL2l5NXpy0WOyJ0Z6Xu2W2/dFYOeufNuDa2O5 j7S/0bcgIbeF/LJmlVt+oVviRT6B4w3VsfUyR6fugvtcJ/yfoG9D3/ZxJZ9CnC06RXdG+eyrxut ls2XH3a0xxC63Iw== X-Received: by 2002:a1c:2cc4:: with SMTP id s187mr4657237wms.36.1601988995379; Tue, 06 Oct 2020 05:56:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwt/Va/EZ57ZPFYV0CpGFlbTfh0g7Kaso5whh9xynKcqrV4rSeY5XklV10J1UM97NWLqQvOLw== X-Received: by 2002:a1c:2cc4:: with SMTP id s187mr4657223wms.36.1601988995221; Tue, 06 Oct 2020 05:56:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Juan Quintela , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 6/9] io: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 14:55:59 +0200 Message-Id: <20201006125602.2311423-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006125602.2311423-1-philmd@redhat.com> References: <20201006125602.2311423-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 10 ++++++++++ io/meson.build | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index 0e3598e267..f9d952d685 100644 --- a/meson.build +++ b/meson.build @@ -1064,6 +1064,7 @@ block_ss =3D ss.source_set() bsd_user_ss =3D ss.source_set() chardev_ss =3D ss.source_set() common_ss =3D ss.source_set() +io_ss =3D ss.source_set() linux_user_ss =3D ss.source_set() qmp_ss =3D ss.source_set() softmmu_ss =3D ss.source_set() @@ -1328,6 +1329,15 @@ qemu_syms =3D custom_target('qemu.syms', output: 'qe= mu.syms', # Library dependencies # ######################## =20 +io_ss =3D io_ss.apply(config_host, strict: false) +libio =3D static_library('io', io_ss.sources() + genh, + dependencies: [io_ss.dependencies()], + link_with: libqemuutil, + name_suffix: 'fa', + build_by_default: false) + +io =3D declare_dependency(link_whole: libio, dependencies: [crypto, qom]) + libmigration =3D static_library('migration', sources: migration_files + ge= nh, name_suffix: 'fa', build_by_default: false) diff --git a/io/meson.build b/io/meson.build index 768c1b5ec3..bcd8b1e737 100644 --- a/io/meson.build +++ b/io/meson.build @@ -1,4 +1,3 @@ -io_ss =3D ss.source_set() io_ss.add(genh) io_ss.add(files( 'channel-buffer.c', @@ -14,12 +13,3 @@ io_ss.add(files( 'net-listener.c', 'task.c', )) - -io_ss =3D io_ss.apply(config_host, strict: false) -libio =3D static_library('io', io_ss.sources() + genh, - dependencies: [io_ss.dependencies()], - link_with: libqemuutil, - name_suffix: 'fa', - build_by_default: false) - -io =3D declare_dependency(link_whole: libio, dependencies: [crypto, qom]) --=20 2.26.2