From nobody Sat Oct 4 19:00:50 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=1601988974; cv=none; d=zohomail.com; s=zohoarc; b=C/fvMeyyK8M5mzHqPFVz4qRR4QUXGd7R1Hs8KatPAC4iF8sbBIL3wVy51qTI5m85MLzpPdPJvwKom9Jq7kzQ4xNH2wP8us4GxK/b2awyAjUud92Rz1X3kV0sRMlAKE54YN2B2nw4/ehVRjmf7NE+rraOKeKutAJHIo7qsTyXmC8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601988974; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=3byOrKG4yoU+gNrvvNZ8ALCAT6xbaRmzFtpysRfVokw=; b=OX4BzyTEYYzknvRsY94BqheGQzJ/4U1gHAAPg34+oXhAG/p0fAHEUwOKoPuP3XnE5VFg06DpvYQ3Pk9W3jKqwC+t/DoQ2bmAhy0vZZyYwxYTpHc51ozBkGfDxYwrmsU5Q7cG/mBXXPZMBtmI0KajduL+k4YLylH74jnPBG85x4k= 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 1601988974295692.0946741438421; Tue, 6 Oct 2020 05:56:14 -0700 (PDT) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-183-fKEBEfuPNPigT0JhAb73eQ-1; Tue, 06 Oct 2020 08:56:11 -0400 Received: by mail-wm1-f70.google.com with SMTP id r19so1071119wmh.9 for ; Tue, 06 Oct 2020 05:56:11 -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 v2sm4202033wme.19.2020.10.06.05.56.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601988973; 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=3byOrKG4yoU+gNrvvNZ8ALCAT6xbaRmzFtpysRfVokw=; b=Qqy2iBleHSYN+EXSaCxOoqxk9N8BClfL730qhn3OT11ryIT+6ORW5H44x4PCFIAcbx1OzJ DXajy4oO2aC+mP0H34fcU/IFbxBOZv7FiOI+JgT27pbXMSwKPkYpGEEbFX1A91QEQvv2Y7 +kPB2So1rMdbI/pe4l0LA6uy3fP1sqM= X-MC-Unique: fKEBEfuPNPigT0JhAb73eQ-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=3byOrKG4yoU+gNrvvNZ8ALCAT6xbaRmzFtpysRfVokw=; b=UV8cKVT91sgLWMPhMOdCL1RpjCXiA6fOVMd3Ue6GSQnr6OCgLs3iYRzKSsV6AOoorO L7QAoy6O2bvzrDsq22aadKwN8t9T/vZXn80AEYRMlrCnHU2Yx+HchEHQDWfaaaY5Wn/t tRRrNogQR+L+0BjNk/B1HhdF06T8qn2gyQqGCF2/CjNsvSJKo+exsO70r7ev59rNbnmX EvFG+4826ue/5zmcjclaAMk4ehJyg+DWJIAQv3/n2RVbJMhd3fB7Z/DyXNo0N2g0NA2N nrnniVmdJoB+OJZd233p0YA3RH0xMIPam+cQaisflb9emlM/G44FumgG/+pp+l17qodE Myuw== X-Gm-Message-State: AOAM532V/44k2zIt6ES6yuY+VjYTbkmHB+kgO83CRixCgbbPpLpDs3mh PMnSvneQDirPRI519+mN6pX8CogcI6Wpo/uKTkVAy3LmwMD+7tKYinlGaWkmRAOEwOzphQOB3/T fTx7fIJqePh6/ww== X-Received: by 2002:adf:dbc3:: with SMTP id e3mr4829666wrj.1.1601988970207; Tue, 06 Oct 2020 05:56:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzLcZlkn6uo2uvxGkfw+8T1ws23uwy2hfnjafpWPvBbmUmIrAN35ZWunoNhYKLY2v1AsoGZg== X-Received: by 2002:adf:dbc3:: with SMTP id e3mr4829643wrj.1.1601988969996; Tue, 06 Oct 2020 05:56:09 -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 1/9] meson.build: Add comments to clarify code organization Date: Tue, 6 Oct 2020 14:55:54 +0200 Message-Id: <20201006125602.2311423-2-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) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meson.build b/meson.build index a02c743794..4101620777 100644 --- a/meson.build +++ b/meson.build @@ -1323,6 +1323,10 @@ qemu_syms =3D custom_target('qemu.syms', output: 'qe= mu.syms', capture: true, command: [undefsym, nm, '@INPUT@']) =20 +######################## +# Library dependencies # +######################## + block_ss =3D block_ss.apply(config_host, strict: false) libblock =3D static_library('block', block_ss.sources() + genh, dependencies: block_ss.dependencies(), @@ -1342,6 +1346,10 @@ libqmp =3D static_library('qmp', qmp_ss.sources() + = genh, =20 qmp =3D declare_dependency(link_whole: [libqmp]) =20 +########### +# Targets # +########### + foreach m : block_mods + softmmu_mods shared_module(m.name(), name_prefix: '', --=20 2.26.2 From nobody Sat Oct 4 19:00:50 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=1601988979; cv=none; d=zohomail.com; s=zohoarc; b=Rg7xk2qSHLOHJBCr207McNV98p32WCPQ9/f8Z2YLX5bjVC2plRQKbPtUuRIcz/qeUpdyFgx3UBjITjVwjhDqy7smILT/YmCKzhNK8qig3npl2O0O/dcsaLbkleuLaBKqI5jcNxTSg/GjIDnZwg3K/uW/ZFaNrADxYk372ZlLMnU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601988979; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=VHqbyXPiJRDV4C8FnQjUpTXWXPI5vIxp7C25lKKq3Fo=; b=azJMFTyd4efy5CxQEaG6XMvZt2hOe1gizX97LwRauN57vD61g9k28dKYYSKigSm7V6kTWqra+mbgITN0xzKWJy3D52RgyMWpXRKSDwugoh6tuRkzuZ9+PelbOEmnE9iG+3N4PQTLhxkBzF6IRHKqxo8W5XCV0ky7Hd7cJM//MKk= 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 1601988979385255.30328536301874; Tue, 6 Oct 2020 05:56:19 -0700 (PDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-113-nM9LUt8jNj-voXvQbK6i6A-1; Tue, 06 Oct 2020 08:56:16 -0400 Received: by mail-wm1-f71.google.com with SMTP id a25so1087459wmb.2 for ; Tue, 06 Oct 2020 05:56:16 -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 f14sm4761594wrv.72.2020.10.06.05.56.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601988978; 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=VHqbyXPiJRDV4C8FnQjUpTXWXPI5vIxp7C25lKKq3Fo=; b=W+pST+bGzFsUTmkICR1HL914sp0nhN8P8o3iXqPWwokUx3TTnRL+NlWgEu3wG5mXZJEnJe u98r6DqikLldOGvGGtvbzUcpALg2m/HM8mp4mMJ+9usradVgDOBWw1iEOflrSwfAH9e6LB LjKSsrRtmrLb64P5KoiQQ5RCX5SM8so= X-MC-Unique: nM9LUt8jNj-voXvQbK6i6A-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=VHqbyXPiJRDV4C8FnQjUpTXWXPI5vIxp7C25lKKq3Fo=; b=ZaLAzI0v3WRudwWfTYzYC2V++oD/2bOx718qFxUwBsDyPrdDCKKimhm+fP2wlklN1Z wm7azNTQ5/PCEZWfoZ90LrUQbEIiLt5Tbk2ODjf+3eghbv+KVu8I30tnRR1HVgyzGxxv cPH2izEtiO7K3xJavHY0tp9BCN6+qSKQJYpVMXoLmvBCFYPNznDEwQjTAVzu18QQx8A8 tGzE7L78lwNDxqBDGFUm8QZjUjWlD4GOPPRYeGg9uCKCspiUNy0UjXKxhS2D4LNH0N/x zhaIJfllviTuITS8FvkVX3HBroeBJbOMP+WZEiq7tfqtMtzA2MSHC5dtw0UPVK9gBZKD KzRQ== X-Gm-Message-State: AOAM531Zb43iu//jCuzBAnG1wUOb1qbdayPvdDGW5kB5lwlsC937HK13 VuBCmZcCAtueyh6KU+1w0WFmFkt7W8hu5U0Kb9OxH4qBgmUh3ZX8ruQz5xePqw/yidrKszbm6kf 3XCHhaYCoONsfnQ== X-Received: by 2002:a5d:6a85:: with SMTP id s5mr2832709wru.90.1601988975096; Tue, 06 Oct 2020 05:56:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeqrQWQCRK1EX2S+oD40CiZSTZfJhoZAZ8DHL2+3uZ/MK8Gtyhjz0sp06K+9lSMCE2NytQGg== X-Received: by 2002:a5d:6a85:: with SMTP id s5mr2832685wru.90.1601988974951; Tue, 06 Oct 2020 05:56:14 -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 2/9] meson.build: Sort sourcesets alphabetically Date: Tue, 6 Oct 2020 14:55:55 +0200 Message-Id: <20201006125602.2311423-3-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) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index 4101620777..60497f5615 100644 --- a/meson.build +++ b/meson.build @@ -1059,19 +1059,19 @@ sphinx_extn_depends =3D [ meson.source_root() / 'do= cs/sphinx/depfile.py', =20 # Collect sourcesets. =20 -util_ss =3D ss.source_set() +blockdev_ss =3D ss.source_set() +block_ss =3D ss.source_set() +bsd_user_ss =3D ss.source_set() +common_ss =3D ss.source_set() +linux_user_ss =3D ss.source_set() +qmp_ss =3D ss.source_set() +softmmu_ss =3D ss.source_set() +specific_fuzz_ss =3D ss.source_set() +specific_ss =3D ss.source_set() stub_ss =3D ss.source_set() trace_ss =3D ss.source_set() -block_ss =3D ss.source_set() -blockdev_ss =3D ss.source_set() -qmp_ss =3D ss.source_set() -common_ss =3D ss.source_set() -softmmu_ss =3D ss.source_set() user_ss =3D ss.source_set() -bsd_user_ss =3D ss.source_set() -linux_user_ss =3D ss.source_set() -specific_ss =3D ss.source_set() -specific_fuzz_ss =3D ss.source_set() +util_ss =3D ss.source_set() =20 modules =3D {} hw_arch =3D {} --=20 2.26.2 From nobody Sat Oct 4 19:00:50 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=1601988984; cv=none; d=zohomail.com; s=zohoarc; b=FU5JCP4Fr0gzFyCIZO8lAoK9DBzlX2x6Wk6zvpPOCI9TPrBELp4OYe4p+oaNFCv1BWbYmA5fVTAHyrq49CDxn3wMMeWKTIXoUImfbtVi3iqH9yASf9AGnK9Hueobz10c/wELGCGbHuCwGZN8YwnyRq3meQKwOm18BChAKmkDyXQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601988984; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=iu4VFbji1NYalAxtgTpGrAQFcSu9AmIxH2mbp91RPjA=; b=bv/jFPMmeMWqB88INtvUjqMAvN/nohosODOo4QtDuv0p9H/RBB2TKkUtNCpZH5QbBfPMoQvNnTi1Y9gTNNc/jTeKKJO1gJcpzxtBYaz01G+Gbra5alYEDBEoky+IuX++e49lvGO/smx7u20gMdW2FPERKFYn59DKxyiuyuU6vZs= 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 1601988984879881.8757962222531; Tue, 6 Oct 2020 05:56:24 -0700 (PDT) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-501-3ov-ImReOr-F1YkXBmhvsw-1; Tue, 06 Oct 2020 08:56:21 -0400 Received: by mail-wm1-f70.google.com with SMTP id 73so662387wma.5 for ; Tue, 06 Oct 2020 05:56:21 -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 b8sm3850769wmb.4.2020.10.06.05.56.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601988983; 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=iu4VFbji1NYalAxtgTpGrAQFcSu9AmIxH2mbp91RPjA=; b=J4//7uzEX/KmoYjD+2JGXEDuprBdlpOpAPHOwEikUjQ0F9C2lbjX6Q3UcG4yrU/iB+cs+q ktXxOB9cWLf+lDFIH0ERGTAKoE4mvtB7pg92ZTrbdYJCc/AExhSa/FWAAQNHFajQjwC+qX oG2nuRpCV/BWpzofy2KcotWLoy2/o/k= X-MC-Unique: 3ov-ImReOr-F1YkXBmhvsw-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=iu4VFbji1NYalAxtgTpGrAQFcSu9AmIxH2mbp91RPjA=; b=n53sc2O7fS6BSv2cy2nM1WciVre8pBKJwSgY3xtEliChLdi7lB2BwXP6aYeI65e/bT gOOvh0phiVxFu6RVyOhnYNWK0SVrr5J2LU/QKZSeaNtPoPa2p7V1W9pulq/VqXrfn+rI JVjeqLy0tbeHByBleosULLlWoAsWH2BXQoRJxhmdfhSc2zuqeAlWbasZABHvkL/8YXea KniWwVYlDK9lY4P5yfM8/0RaNKpPbRtqPFmYU69GWdlsRhWumAaF+krePRSFfBVTqHYO V2rev7QIsdPMclbifOYMgEwGry71e9STRNXhcR693mdi3DMXUk5D1k1J6mWWjsSM88dG Pmaw== X-Gm-Message-State: AOAM533WbLorjHCKp2gvw9wzIQrHkBOqAVKzfdA0mdvq4iKg4DVorita XeZe7LHzfWyb340Xv64C8e7wY1O97GPgM55zfP6BdlSjhNfuB3TRRiC8Hq/Nqci4rJ/7A5MWM24 1kLyTDexeHKtAfg== X-Received: by 2002:adf:f584:: with SMTP id f4mr4590304wro.383.1601988980104; Tue, 06 Oct 2020 05:56:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+WUzcbY4Qb1+NBLQViKKYuMdVWkEAjiUpRbAfy8WJwU2jgXQJd/r6+HrmRrPY5XIl/x7DLg== X-Received: by 2002:adf:f584:: with SMTP id f4mr4590284wro.383.1601988979900; Tue, 06 Oct 2020 05:56:19 -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 3/9] hw/core: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 14:55:56 +0200 Message-Id: <20201006125602.2311423-4-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 | 6 ++++++ hw/core/meson.build | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 60497f5615..47eb7d3709 100644 --- a/meson.build +++ b/meson.build @@ -1346,6 +1346,12 @@ libqmp =3D static_library('qmp', qmp_ss.sources() + = genh, =20 qmp =3D declare_dependency(link_whole: [libqmp]) =20 +libhwcore =3D static_library('hwcore', sources: hwcore_files + genh, + name_suffix: 'fa', + build_by_default: false) +hwcore =3D declare_dependency(link_whole: libhwcore) +common_ss.add(hwcore) + ########### # Targets # ########### diff --git a/hw/core/meson.build b/hw/core/meson.build index fc91f98075..4a744f3b5e 100644 --- a/hw/core/meson.build +++ b/hw/core/meson.build @@ -14,12 +14,6 @@ hwcore_files =3D files( 'qdev-clock.c', ) =20 -libhwcore =3D static_library('hwcore', sources: hwcore_files + genh, - name_suffix: 'fa', - build_by_default: false) -hwcore =3D declare_dependency(link_whole: libhwcore) -common_ss.add(hwcore) - common_ss.add(files('cpu.c')) common_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) common_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loade= r.c')) --=20 2.26.2 From nobody Sat Oct 4 19:00:50 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=1601988992; cv=none; d=zohomail.com; s=zohoarc; b=O5tBfjco27R9M9L6D855CJ5vOX87IJViCtvXDJMJtc1yqxi9Aiz0xNjSO+b/Apd8ZqcTAhcMW2Un6H3pB3TgR/HXCQSQxWvox1E9ETPRw+Qys1KXxnRiAh4uLiDKp3CELfpyEOGn3dI6brLA+cLPPm2b7gdf0md2UTzKwFfS/mc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601988992; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=8XFQO4+C4ntP2b83qPWVKeB3auO8XBYBXJzdLRqnK/M=; b=FLlc8lmFUnSGMHJ2ThqimyziA7jPOZJZF61dWXNShUMV+ejpRhK7Lakd2eYynMFNSC+PYkeuLnPGpKYVVwxpvMzEX2Bvx0guT9IlR2eCBTYJrRL72JeFF6xJ8gv2CjQTrP2brecwmqJTUopt73TtnqBmP5LvmGxM6tuIGsAwdGE= 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 160198899264760.04523556867275; Tue, 6 Oct 2020 05:56:32 -0700 (PDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-515-t8zLrrsMPXur_Nj4MBx8kw-1; Tue, 06 Oct 2020 08:56:26 -0400 Received: by mail-wm1-f71.google.com with SMTP id i9so665607wml.2 for ; Tue, 06 Oct 2020 05:56:26 -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 c4sm3950738wme.27.2020.10.06.05.56.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601988990; 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=8XFQO4+C4ntP2b83qPWVKeB3auO8XBYBXJzdLRqnK/M=; b=TDAd+Hz38sYDKEH94PD925lukEye7Q+208l03dTvRerck8BzFt8G5YoDLjlqckeZJ8VOf4 +l6Gi8bunA1Jwn0CQ8BG+zDnw6EgnzNZYgie0lZc38saQubXouIo3aQdajAXP3ECja9Q8d l/pgXooBgfVb+aZ5tiFk2nLAnUwvUqI= X-MC-Unique: t8zLrrsMPXur_Nj4MBx8kw-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=8XFQO4+C4ntP2b83qPWVKeB3auO8XBYBXJzdLRqnK/M=; b=CzHMwiNz4pWNl05+iC2Iy6Q4W8mFPRggmZo9YZCY2KsnFieEdU5l72weWMpxYJ25Yn /Eft4yJ/Bi0nD+NEiGrgJ1TTVaunyIuMvL72W60gaNJB6yZuIxRY/dyw+TmD94pEYFkg CoKCAlbnE3VsHg10uveJIBV2guUDUnoTl48xSI1TQwUu/rCi/zWeAxLknT75AGtRCGu0 QYUDgYTsgsdmv/o/rwykS+NeNbAi59gWulUfx7BqE6iOdxHdoVNBWZMGR7C9Ux5ET8jG y6xo/42YTxwx2SmSMNXMrJehn0+P+JjaSVag/nCmr4vMAmR5sdZKgeNW+h9NXyKuAbQL uDxA== X-Gm-Message-State: AOAM53011hHmrZXEsq5y22TMPlYjX2YpsR/Ws1+AsSFvKkthPI/9bdLH cV5l35WHD5CzeT20VG6zLUWwDXZvQ61Uq216le0I1I0/m5nghfYf/MyKk9I2pM4gS552KwhRW09 FjVVYiX4PBIB3sQ== X-Received: by 2002:a5d:6311:: with SMTP id i17mr4576643wru.243.1601988985346; Tue, 06 Oct 2020 05:56:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwp9TFYXdx8eKlKnz69xteHGW/NyBhHnCt25BlfDngVePi8xiWeZZb2/mGFxP6YCeosXeHWCw== X-Received: by 2002:a5d:6311:: with SMTP id i17mr4576632wru.243.1601988985189; Tue, 06 Oct 2020 05:56:25 -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 4/9] chardev: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 14:55:57 +0200 Message-Id: <20201006125602.2311423-5-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 | 7 +++++++ chardev/meson.build | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 47eb7d3709..3c0d7b4d44 100644 --- a/meson.build +++ b/meson.build @@ -1062,6 +1062,7 @@ sphinx_extn_depends =3D [ meson.source_root() / 'docs= /sphinx/depfile.py', blockdev_ss =3D ss.source_set() 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() linux_user_ss =3D ss.source_set() qmp_ss =3D ss.source_set() @@ -1346,6 +1347,12 @@ libqmp =3D static_library('qmp', qmp_ss.sources() + = genh, =20 qmp =3D declare_dependency(link_whole: [libqmp]) =20 +libchardev =3D static_library('chardev', chardev_ss.sources() + genh, + name_suffix: 'fa', + build_by_default: false) + +chardev =3D declare_dependency(link_whole: libchardev) + libhwcore =3D static_library('hwcore', sources: hwcore_files + genh, name_suffix: 'fa', build_by_default: false) diff --git a/chardev/meson.build b/chardev/meson.build index 54e88d0310..dd2699a11b 100644 --- a/chardev/meson.build +++ b/chardev/meson.build @@ -1,4 +1,3 @@ -chardev_ss =3D ss.source_set() chardev_ss.add(files( 'char-fe.c', 'char-file.c', @@ -25,11 +24,6 @@ chardev_ss.add(when: 'CONFIG_WIN32', if_true: files( )) =20 chardev_ss =3D chardev_ss.apply(config_host, strict: false) -libchardev =3D static_library('chardev', chardev_ss.sources() + genh, - name_suffix: 'fa', - build_by_default: false) - -chardev =3D declare_dependency(link_whole: libchardev) =20 softmmu_ss.add(files('chardev-sysemu.c', 'msmouse.c', 'wctablet.c', 'testd= ev.c')) softmmu_ss.add(when: ['CONFIG_SPICE', spice], if_true: files('spice.c')) --=20 2.26.2 From nobody Sat Oct 4 19:00:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1601988994; cv=none; d=zohomail.com; s=zohoarc; b=fC7Lk1WtotvS/pOju7TKISu4hpj8ylQJ64baCdD1SsbtNNCgJL4Uc2rnlB3s8uUUxB11Pno5N03CSBfCMOXGoeE28CHTztsTt4jatAw4tKQgqJldhN3utf5v9wYoR+2oZ0z8Q1rh9MOcvphnV+SpEIsr9pmwoBgtH0r1sOoGhZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601988994; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=+civm+lmzYKDJ7YA3YOOXf6dQ0UsRfqcLEm+1Urmtw8=; b=EGltdF/wHkuSVTwlPdTytgy/TdNaf+r7l2TzCUMuO+NGtb1eXx5DynjBhNJJ92rCt8Nkr0yLau6bvQhH+Od8Wcs/ZwkL+x+fve8fDayiPl1nP0GcFr+y8FN1+AtyPqDT1G2okL9UJs72qd72T193LgqVtuH0uMXQ6E/yPWe27Uo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601988994498781.7721428749566; Tue, 6 Oct 2020 05:56:34 -0700 (PDT) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-536-G-iTyCD7PzC3_RLODUG1Zg-1; Tue, 06 Oct 2020 08:56:31 -0400 Received: by mail-wr1-f70.google.com with SMTP id v12so5325320wrm.9 for ; Tue, 06 Oct 2020 05:56:31 -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 b11sm4322492wrt.38.2020.10.06.05.56.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601988993; 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=+civm+lmzYKDJ7YA3YOOXf6dQ0UsRfqcLEm+1Urmtw8=; b=bg0BAEmELH2IGCH7mnVT4tg+3vRBvQfENBDa/TLrqq6LwcV6StTi16SIxDwu5lx8U74z7D adUgE7114XOuXyuy/07bk0qXauGU9Zjs4X50siu2yUSJGBO2PGZ3AMcFBKJpryj8kh+4MX /MLRqcLvu2BBH9COl4bpGYm1uDfOBmY= X-MC-Unique: G-iTyCD7PzC3_RLODUG1Zg-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=+civm+lmzYKDJ7YA3YOOXf6dQ0UsRfqcLEm+1Urmtw8=; b=R4PVkPN0KCEH96zrJNZecxG79cUsEB8yOni3vhr9pnHHwY6dftXjnMZPfntdNfiFiV CYPzP7uSllnFT+yvrxlLdiZb0bbruuHukUg/VIOiL3iasz9gmST/TGmOKL5x5grf36Bi 4Nei00CE/1/9qRfTJJNoUaJBFDlL4Y7HzJ9CT60suVrcwnMyjzdULX/ypw+w4Fe0ACbZ lKoQ90xHo1WovFvo0w7z3XcXg9s3qPyQwUvaIo45OgZUchdNHOYehlUMhuqmMLsoDFCS WAF+CCcb7OIjApKp8EnOG+FqCruEkUU5K79odTu2ig02rWX2elA3s7mjlVAT58FBt282 YCVA== X-Gm-Message-State: AOAM533ygfYajMsW/cxP3dBxJAFiHPEiH6MWbkLH3BBrya9+R8SAL1UI Zg3eD8ZCF/3V9qllgf2qekBIhUWnYFUjhV9D0DEW9ues3diky408K/YzkMn641QAvYxgu+Ubve8 jhTLYg9Ah93dOyg== X-Received: by 2002:a05:600c:c5:: with SMTP id u5mr4621350wmm.14.1601988990457; Tue, 06 Oct 2020 05:56:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBBR0nks+OH7sHMF017w1FYq4pUfMy/bUhEy3McUfY03FAVeOwyySBY/4nz4VfzW+Btxe7zA== X-Received: by 2002:a05:600c:c5:: with SMTP id u5mr4621334wmm.14.1601988990293; Tue, 06 Oct 2020 05:56:30 -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 5/9] migration: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 14:55:58 +0200 Message-Id: <20201006125602.2311423-6-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 | 7 +++++++ migration/meson.build | 8 +------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 3c0d7b4d44..0e3598e267 100644 --- a/meson.build +++ b/meson.build @@ -1328,6 +1328,13 @@ qemu_syms =3D custom_target('qemu.syms', output: 'qe= mu.syms', # Library dependencies # ######################## =20 +libmigration =3D static_library('migration', sources: migration_files + ge= nh, + name_suffix: 'fa', + build_by_default: false) +migration =3D declare_dependency(link_with: libmigration, + dependencies: [zlib, qom, io]) +softmmu_ss.add(migration) + block_ss =3D block_ss.apply(config_host, strict: false) libblock =3D static_library('block', block_ss.sources() + genh, dependencies: block_ss.dependencies(), diff --git a/migration/meson.build b/migration/meson.build index b5b71c8060..980e37865c 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -8,13 +8,7 @@ migration_files =3D files( 'qemu-file.c', 'qjson.c', ) - -libmigration =3D static_library('migration', sources: migration_files + ge= nh, - name_suffix: 'fa', - build_by_default: false) -migration =3D declare_dependency(link_with: libmigration, - dependencies: [zlib, qom, io]) -softmmu_ss.add(migration) +softmmu_ss.add(migration_files) =20 softmmu_ss.add(files( 'block-dirty-bitmap.c', --=20 2.26.2 From nobody Sat Oct 4 19:00:50 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 From nobody Sat Oct 4 19:00:50 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=1601989008; cv=none; d=zohomail.com; s=zohoarc; b=E5rWlPLFbm35IyH3VHlBLFSc1gRy5fFYljHB2zm87IqVfGOvxp+xNyA4qgQvz+B8bHzXsve+n/NN7AFbxRF3nP0tXqS5FCltNWLnRAhHGUTJOSIuiXoufLKGzjeDEuLmB736jm/Y35+o6DRou3S4hAaRi/BLEJ+gHqOWBhN85EY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601989008; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=XTtKHQhxHEaBS5luua2HAb5gxNyfeWuRj6nkxOmCXlg=; b=Iznfq/1oeX1gSfyjLk09rDWq8XC2o5wjtCauoaxBWbSb4/fDu3WmA7ROrYn/jsmqXrZ8l4Kerax5DLvK+MuAtsQDrGXWwTaYjLpSK/eU4/COTBx35ArNY/DY+dhi3HPxAT80Xvpdvxjgudu0MK0K+6N4BcRRo6IK6a9/13wCfhU= 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 1601989008711798.3568816336522; Tue, 6 Oct 2020 05:56:48 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-349-IBSGVvCZOXOWsngqrpVapw-1; Tue, 06 Oct 2020 08:56:43 -0400 Received: by mail-wr1-f72.google.com with SMTP id v12so5325459wrm.9 for ; Tue, 06 Oct 2020 05:56:41 -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 z11sm4404934wru.88.2020.10.06.05.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601989007; 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=XTtKHQhxHEaBS5luua2HAb5gxNyfeWuRj6nkxOmCXlg=; b=gYu643RKqolWllmnNuAOEQjDusRdzkM4USS10Hwr/z8LCdq4EKXPGnMUPRb4dJocLFNtEz 5vfevNJdMF4Q7FaTc0o1cV7RmJwJH08W/+vpNdpHGX8Es2O2anjalZC+cp7BK5FCjBgqLA uL6dsfTQ2e43Jas9IrTa0CRIFA+blMw= X-MC-Unique: IBSGVvCZOXOWsngqrpVapw-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=XTtKHQhxHEaBS5luua2HAb5gxNyfeWuRj6nkxOmCXlg=; b=BblfpVMuay2/pf2ani6anJ+YWReGxZLS7ed060FfwH3lyF1prFVFNwrNCJYmMpufpF NagXq4z0QqbpzSKuR2vSq+IITg/TH/YS/TSGJDrinR3MR6rsiZS1xYfavSfKdZqvhD65 +NxVbcwNZ6RRAb05W2kUQbnO9UUPlS6dLiK2jAszQZdScCWREM4fsANZDz2LeBzqNFFT eqZoJPdrU3PtSj1FzVJbnzm6yYQWhwgu6N2LT/RZYE57AQkeSZJrK9eHpHoZ9QVvfv69 uj9tUY8bB4/m4Jh377GCtC26VSpx/Q9wbQyDXvXTxkWK6pE6XviUsjtiNEUkLxjRGqrY S86g== X-Gm-Message-State: AOAM531J3XR8gbjpSlrvg17ZejoNy9aOFkaM53p/AUvG51YqNhAM/X0K OApuj4l7IDG46szYloIPZ2rgA/DqJ/R7ZJY3peEmEmtsmRpbhB7fLulZvUvQaI5jB6hSYa3KSsN pxzZYbGifODcPkQ== X-Received: by 2002:adf:a345:: with SMTP id d5mr2707718wrb.55.1601989000438; Tue, 06 Oct 2020 05:56:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxX8/rtlX/9R/0HtvfRUKeDnzH58wOuyHOuu7MluYltgob8IsSHLO2hsQPA0GvmKTfLk9T4Jw== X-Received: by 2002:adf:a345:: with SMTP id d5mr2707702wrb.55.1601989000248; Tue, 06 Oct 2020 05:56:40 -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 7/9] crypto: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 14:56:00 +0200 Message-Id: <20201006125602.2311423-8-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 ++++++++++ crypto/meson.build | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index f9d952d685..d064d07dae 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() +crypto_ss =3D ss.source_set() io_ss =3D ss.source_set() linux_user_ss =3D ss.source_set() qmp_ss =3D ss.source_set() @@ -1329,6 +1330,15 @@ qemu_syms =3D custom_target('qemu.syms', output: 'qe= mu.syms', # Library dependencies # ######################## =20 +crypto_ss =3D crypto_ss.apply(config_host, strict: false) +libcrypto =3D static_library('crypto', crypto_ss.sources() + genh, + dependencies: [crypto_ss.dependencies()], + name_suffix: 'fa', + build_by_default: false) + +crypto =3D declare_dependency(link_whole: libcrypto, + dependencies: [authz, qom]) + io_ss =3D io_ss.apply(config_host, strict: false) libio =3D static_library('io', io_ss.sources() + genh, dependencies: [io_ss.dependencies()], diff --git a/crypto/meson.build b/crypto/meson.build index f6f5ce1ecd..7f37b5d335 100644 --- a/crypto/meson.build +++ b/crypto/meson.build @@ -1,4 +1,3 @@ -crypto_ss =3D ss.source_set() crypto_ss.add(genh) crypto_ss.add(files( 'afsplit.c', @@ -52,15 +51,6 @@ if 'CONFIG_GNUTLS' in config_host endif =20 =20 -crypto_ss =3D crypto_ss.apply(config_host, strict: false) -libcrypto =3D static_library('crypto', crypto_ss.sources() + genh, - dependencies: [crypto_ss.dependencies()], - name_suffix: 'fa', - build_by_default: false) - -crypto =3D declare_dependency(link_whole: libcrypto, - dependencies: [authz, qom]) - util_ss.add(files('aes.c')) util_ss.add(files('init.c')) =20 --=20 2.26.2 From nobody Sat Oct 4 19:00:50 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=1601989009; cv=none; d=zohomail.com; s=zohoarc; b=UeAZwmI4pJfL+owYRtQ7FywhJ8/sBd+2pdtWoPj2hfvcTNlocOh7/8GUWQWIDydjCrZqM1V6loGC5L9rUviA4H1LOQcl04F1IiG2tF5KW1WxHJUEwnAKjNgECzuOhA5dp8pnr2x2kgfbxQvrRBgwgyxzlwh2cGgJJD9tIvRhGVI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601989009; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=ZbwAwPx3ANbvemm3sKJq8R8pcWj7ZDfAwWyPc+pq4Mw=; b=E1KNgYYlUYO1WkkJMONdJ3i/OhVhLMjF6jFdL7wLwK1f9wX3AdE9rHTBFUg7bHRRkDQrqSfytBOP11xFODuYtidT3mIAGzS7glfsiUQD8XS5QTsxARnuujnoig6gXsQglCLdIA6+r50R2+mxUKeC4vyDMN655OXGn1R3D5r2MMY= 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 1601989009442650.8392798419793; Tue, 6 Oct 2020 05:56:49 -0700 (PDT) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-137-GJxYrDKiM6OgDADfxEfdeQ-1; Tue, 06 Oct 2020 08:56:46 -0400 Received: by mail-wm1-f70.google.com with SMTP id m14so670363wmi.0 for ; Tue, 06 Oct 2020 05:56:46 -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 u5sm5299722wru.63.2020.10.06.05.56.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601989008; 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=ZbwAwPx3ANbvemm3sKJq8R8pcWj7ZDfAwWyPc+pq4Mw=; b=FUTCAM1UgKFhs7OxLS81rjWJE5bvHstGE6Oxi2MJoVdnhX3haz0vTh8Bs/4QqfknLPnHUF BRPoUZjmHwLVK4rxg+9t/yeavuj5NvKGN8xhg3oXdGMu6hwovDxLrpht8oV7AaIAWzImeH wdj908V+gyK09uqtehB/UdXX2LPIX8g= X-MC-Unique: GJxYrDKiM6OgDADfxEfdeQ-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=ZbwAwPx3ANbvemm3sKJq8R8pcWj7ZDfAwWyPc+pq4Mw=; b=fL+1k+P40zdlkMbfg3Rm6TThPLkNW/HyD+AoY0189CEzVJRYO3T2b1vLmEVzvDQkE7 K6rgFmOqn6VC/kwp4YFVNrEtSDLPiE89YRJfi/0eGM0IMAILBFThlWfWqTqlrxu/Vo4F rPit17uYbVlHYHkf9KX7LAMyz7P5Vw5zXiIhcApf3BAd541dmb5HNHXuFzwl6uWug661 jvxcKLMAIYj8jSDy8i8t/JBUjy4z5I6Wu54Wk9a7CqBQwoCwtBG/aO/xv6LW2Cl5U+Mu ZKQdCL6VSu6Wf1CsLansXH1R2BpEL8HnhxDS7dAoq5AM2am3Nvw8FYd//eHXouGWDlIX 4/gQ== X-Gm-Message-State: AOAM531GdcsE4IWwU03tw6OGXoNTdPS+CwLlteYKX/BY5S6CTmcuqM8j +NdhKcACcG3U35IEQ1bDdGcR9m7RlXYRMz5V+B+rFwWcr5xbkNLi3WX7k5M2G8X2RtTNEVIOU1p 7yGj0xodyaUgNkg== X-Received: by 2002:a7b:c0c8:: with SMTP id s8mr4590420wmh.78.1601989005458; Tue, 06 Oct 2020 05:56:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2atI0g0njW4x5KCvdzBpMWVn388OIIV8mTdOt8DT92+Kcm9+fdZCGGE1BfDRf3vPJEHbH9A== X-Received: by 2002:a7b:c0c8:: with SMTP id s8mr4590408wmh.78.1601989005296; Tue, 06 Oct 2020 05:56:45 -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 8/9] authz: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 14:56:01 +0200 Message-Id: <20201006125602.2311423-9-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 ++++++++++ authz/meson.build | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index d064d07dae..73838d1d4f 100644 --- a/meson.build +++ b/meson.build @@ -1059,6 +1059,7 @@ sphinx_extn_depends =3D [ meson.source_root() / 'docs= /sphinx/depfile.py', =20 # Collect sourcesets. =20 +authz_ss =3D ss.source_set() blockdev_ss =3D ss.source_set() block_ss =3D ss.source_set() bsd_user_ss =3D ss.source_set() @@ -1330,6 +1331,15 @@ qemu_syms =3D custom_target('qemu.syms', output: 'qe= mu.syms', # Library dependencies # ######################## =20 +authz_ss =3D authz_ss.apply(config_host, strict: false) +libauthz =3D static_library('authz', authz_ss.sources() + genh, + dependencies: [authz_ss.dependencies()], + name_suffix: 'fa', + build_by_default: false) + +authz =3D declare_dependency(link_whole: libauthz, + dependencies: qom) + crypto_ss =3D crypto_ss.apply(config_host, strict: false) libcrypto =3D static_library('crypto', crypto_ss.sources() + genh, dependencies: [crypto_ss.dependencies()], diff --git a/authz/meson.build b/authz/meson.build index 516d71f2e2..88fa7769cb 100644 --- a/authz/meson.build +++ b/authz/meson.build @@ -1,4 +1,3 @@ -authz_ss =3D ss.source_set() authz_ss.add(genh) authz_ss.add(files( 'base.c', @@ -8,12 +7,3 @@ authz_ss.add(files( )) =20 authz_ss.add(when: ['CONFIG_AUTH_PAM', pam], if_true: files('pamacct.c')) - -authz_ss =3D authz_ss.apply(config_host, strict: false) -libauthz =3D static_library('authz', authz_ss.sources() + genh, - dependencies: [authz_ss.dependencies()], - name_suffix: 'fa', - build_by_default: false) - -authz =3D declare_dependency(link_whole: libauthz, - dependencies: qom) --=20 2.26.2 From nobody Sat Oct 4 19:00:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1601989015; cv=none; d=zohomail.com; s=zohoarc; b=HaDdG1eriiBjQfMh3GeJ7wEVuk8W5K4WP3A+imGnAttrmg8hC3HaLTX01T2OT3bwaYDREOD/mESflyyhQa1/0f+ibriRt+cXtvUj36ve1A+uT27043bQbIM0Pozj6/rAQvE8Q1i01NHKjRVrRAz2rJo0cCtpehwk9L/7+OMWg90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601989015; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=dIu+djJuCswrC2cqo2qdUA9sOVAn/pwzVndOyQMdzOQ=; b=TUuz3RaKn8kncMWTHYo+p1iiXu3IuD/E4+iBVpVXu+4W2VQPxNBUWYogxQfBywLPMt12dYeYZiRx2qg8yfL6P2YN2K/CnLVd0O+MB3Y1DCSrco0pQzz1/nHs1QUqFPPLKg6z0xBiu+adqX0yhRXEhe51/H2mHIK/wPxy+IoGlg8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601989014794821.7040305883992; Tue, 6 Oct 2020 05:56:54 -0700 (PDT) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-338-OXJvQKm2M8SOM9qy3Qt_6Q-1; Tue, 06 Oct 2020 08:56:51 -0400 Received: by mail-wm1-f70.google.com with SMTP id y83so657449wmc.8 for ; Tue, 06 Oct 2020 05:56:51 -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 m18sm3781973wmg.32.2020.10.06.05.56.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 05:56:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601989013; 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=dIu+djJuCswrC2cqo2qdUA9sOVAn/pwzVndOyQMdzOQ=; b=Mc07mg4+rPYylQ/TrLM1lIEW75xZakgQAorIljJjjL+MqG4bgUSoDripPwkpJa+2kPHZqI +V50+6AjlzpO6mpIt0MBbWjvj3B484F0XsBbT4g0fB3iq0cuZKDvFOO03SX/BB7m8zvY3S DZM+Q2rjtMseEFQhoT8XTBsZJGX2ZRc= X-MC-Unique: OXJvQKm2M8SOM9qy3Qt_6Q-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=dIu+djJuCswrC2cqo2qdUA9sOVAn/pwzVndOyQMdzOQ=; b=NiUihN4sU24/fx0GFJmrdD2wsKA/w/YEIfoDx/Hkyc6Lwc0vh3KkH9R0AnKD5tOwU7 zDC27U6ou7VFfAv9DVATgkA4OUnGhbVxdJs+yW25wVpdsyuV0r0vgr4CiSoBLxMRl0ZR 1ogQHwFlkqK+UVCctRcaoaT3Y7UPl7MlntaQP6EHf0IeJrNx86q5V72yoIDN/K9UAUPN 44Xi4Z1hBsPD4mnD6i8XZyf2Voc41ycZjdfzVjh3UfMAp+iKzKMq5rNlq/+zXn08+eJ8 xppY+aqk7TTmlrx2TyROz6k4pEvOCef7/Sr65UXB51IjmyFryNP+wUr8UV+V8XpHiaP1 jFhA== X-Gm-Message-State: AOAM533KS/9lH3pncGsFxvpc127OQPVTjnHcJPUavneTVf1AJ6qeeF26 Hc5Pj5r4evkZSbEuZqQ/ni71l14zaWBuTZDXpasTR3VvDRg90tEIJYpJjsZO68W2WJ+x14+POum FgIR06z262HBx2Q== X-Received: by 2002:a1c:8104:: with SMTP id c4mr4885718wmd.112.1601989010591; Tue, 06 Oct 2020 05:56:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCW/FuG9EMZZBisRNBdS8c1CZVhlrB5OFZKV8YoBlijS+J1iKw82pFtZPS9kKyQKj20dCQMA== X-Received: by 2002:a1c:8104:: with SMTP id c4mr4885690wmd.112.1601989010423; Tue, 06 Oct 2020 05:56:50 -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 9/9] qom: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 14:56:02 +0200 Message-Id: <20201006125602.2311423-10-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 | 8 ++++++++ qom/meson.build | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 73838d1d4f..72c8d3ad39 100644 --- a/meson.build +++ b/meson.build @@ -1069,6 +1069,7 @@ crypto_ss =3D ss.source_set() io_ss =3D ss.source_set() linux_user_ss =3D ss.source_set() qmp_ss =3D ss.source_set() +qom_ss =3D ss.source_set() softmmu_ss =3D ss.source_set() specific_fuzz_ss =3D ss.source_set() specific_ss =3D ss.source_set() @@ -1331,6 +1332,13 @@ qemu_syms =3D custom_target('qemu.syms', output: 'qe= mu.syms', # Library dependencies # ######################## =20 +qom_ss =3D qom_ss.apply(config_host, strict: false) +libqom =3D static_library('qom', qom_ss.sources() + genh, + dependencies: [qom_ss.dependencies()], + name_suffix: 'fa') + +qom =3D declare_dependency(link_whole: libqom) + authz_ss =3D authz_ss.apply(config_host, strict: false) libauthz =3D static_library('authz', authz_ss.sources() + genh, dependencies: [authz_ss.dependencies()], diff --git a/qom/meson.build b/qom/meson.build index a1cd03c82c..062a3789d8 100644 --- a/qom/meson.build +++ b/qom/meson.build @@ -1,4 +1,3 @@ -qom_ss =3D ss.source_set() qom_ss.add(genh) qom_ss.add(files( 'container.c', @@ -9,10 +8,3 @@ qom_ss.add(files( =20 qmp_ss.add(files('qom-qmp-cmds.c')) softmmu_ss.add(files('qom-hmp-cmds.c')) - -qom_ss =3D qom_ss.apply(config_host, strict: false) -libqom =3D static_library('qom', qom_ss.sources() + genh, - dependencies: [qom_ss.dependencies()], - name_suffix: 'fa') - -qom =3D declare_dependency(link_whole: libqom) --=20 2.26.2