From nobody Mon Feb 9 19:53:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1635792199; cv=none; d=zohomail.com; s=zohoarc; b=jRqdhqz9flFx6zeauCUh+pH85cak0ChCQtwm3e0ZQG8aMzIrJv13BFE4omSM1Kqj3xDHsIy9RyqkoiKFsCbzZtqZG0Jq8yn3I5ZdYnX+mnKksyQB5VlV82278p4LtuNJHpIGfx7Wp4ZiEaKdTIt1HtTI+fN2cs2HRDqdtTT4Ip0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635792199; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=IhijWbgKLTtnsiOPXsxu08OvEiKOisd4DyugRUJL+wM=; b=c/92VMW+qOT07nHBEWqntPHT6QYg3Z3w3AbhqEaoKRwW7MG5UO9H8YkX9p5zGcu8KPBJWKn1xeoa8tca3AVmRAJgMt0yg4YIjLVDHDE9VHEzy86gmRfSHnRSnooKUJMZ4c+/GhrTviPmj+aR4LrGFX8u9JBsXLuggmkWGydqxvA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1635792199456892.9610153013708; Mon, 1 Nov 2021 11:43:19 -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-192-hysmqsRZO5uu-Zl0kacbYA-1; Mon, 01 Nov 2021 14:43:17 -0400 Received: by mail-wr1-f70.google.com with SMTP id z5-20020a5d6405000000b00182083d7d2aso2096663wru.13 for ; Mon, 01 Nov 2021 11:43:17 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id l124sm304374wml.8.2021.11.01.11.43.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 11:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635792198; 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=IhijWbgKLTtnsiOPXsxu08OvEiKOisd4DyugRUJL+wM=; b=LiEtPUIT/VHaeR71/PRdu8X2dhiWyQqqjysNBaoWJYu1i5ko3GWwBq+hINSEQq4lysgQCt 3fG2ta3UW1UUPMbPooQWZCIB3VFQf3gvAvj6mUoU/ARkdYIfbiV0TwRNSw1XzyXtrmh5KC wsd/thCj8t5O+oIk7MgRxwso/t13O3A= X-MC-Unique: hysmqsRZO5uu-Zl0kacbYA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IhijWbgKLTtnsiOPXsxu08OvEiKOisd4DyugRUJL+wM=; b=srCcDLsHm2I4ODkNJkKBVxCtKueC+ElYeA/tYim7QkzGvqQ+GajsvxxYoZqmtbghRC w3Zm4bEapUYqyx8NFiTg7yiXdGvqAP8jy6yVnp/hzwt38KTfvfOK9NSYuOQBmTyMAFXA dB5uLl1Jn9MYqfY+shdix+GDM0CsKu9bDa9QqBXEzudXgUmRu9yd0nY5eLXl1heMPKWr xMh8IU5Oe7AWmf4KQaKjwkDU+MTJjWZ3041gF8GH+b3GmP6JkC3ez6CDwUKT+JqKlr9U pComZYBjbbBRm+AJLvYVdYi+ARB7Eknf4fDMVuStPZtbvk70x1PPTvu+HaW9mgNA5RLc E6ag== X-Gm-Message-State: AOAM532qNZlBh6QiJmRsl/iQBIKZDFtszqK9xM4H7NuMSdmbWGe9frle pkWSDNbXRPtqjiOa2n/Cekv9eb8Kk3rJEY1+3/PuPqsPUpY35q43zjlMfixrX0aPRinPG+GSSNs cojSIxObcuGITrw== X-Received: by 2002:a5d:69c5:: with SMTP id s5mr36834177wrw.283.1635792196199; Mon, 01 Nov 2021 11:43:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfnLqbxMIwErwRSz3QcOyUFEpGwdo7C00sF7zicqDvDsgPuicCaBl0IzZM7tQ3NZN+0CiKtw== X-Received: by 2002:a5d:69c5:: with SMTP id s5mr36834164wrw.283.1635792196085; Mon, 01 Nov 2021 11:43:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Marcel Apfelbaum , Yanan Wang Subject: [PULL 03/10] hw/core: Declare meson source set Date: Mon, 1 Nov 2021 19:42:52 +0100 Message-Id: <20211101184259.2859090-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211101184259.2859090-1-philmd@redhat.com> References: <20211101184259.2859090-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) X-ZM-MESSAGEID: 1635792201559100002 As we want to be able to conditionally add files to the hw/core file list, use a source set. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Yanan Wang Tested-by: Yanan Wang Acked-by: Eduardo Habkost Message-Id: <20211028150521.1973821-3-philmd@redhat.com> --- meson.build | 4 +++- hw/core/meson.build | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index b0927283976..85f1e43dfe6 100644 --- a/meson.build +++ b/meson.build @@ -2365,6 +2365,7 @@ chardev_ss =3D ss.source_set() common_ss =3D ss.source_set() crypto_ss =3D ss.source_set() +hwcore_ss =3D ss.source_set() io_ss =3D ss.source_set() linux_user_ss =3D ss.source_set() qmp_ss =3D ss.source_set() @@ -2806,7 +2807,8 @@ =20 chardev =3D declare_dependency(link_whole: libchardev) =20 -libhwcore =3D static_library('hwcore', sources: hwcore_files + genh, +hwcore_ss =3D hwcore_ss.apply(config_host, strict: false) +libhwcore =3D static_library('hwcore', sources: hwcore_ss.sources() + genh, name_suffix: 'fa', build_by_default: false) hwcore =3D declare_dependency(link_whole: libhwcore) diff --git a/hw/core/meson.build b/hw/core/meson.build index 6af4c5c5cbc..cc1ebb8e0f4 100644 --- a/hw/core/meson.build +++ b/hw/core/meson.build @@ -1,5 +1,5 @@ # core qdev-related obj files, also used by *-user and unit tests -hwcore_files =3D files( +hwcore_ss.add(files( 'bus.c', 'hotplug.c', 'qdev-properties.c', @@ -11,7 +11,7 @@ 'irq.c', 'clock.c', 'qdev-clock.c', -) +)) =20 common_ss.add(files('cpu-common.c')) softmmu_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) --=20 2.31.1