From nobody Mon Feb 9 18:45:38 2026 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=1635433538; cv=none; d=zohomail.com; s=zohoarc; b=nbCYdcqyO2WpHvTI+3y5+Yqdw2gxhlzSfOOWhrgvmQMI6lccjAALM2VYC09vgA900U5Z4mA6QJS3jWe1uWtsJz5QCwJbUmn3ryh8HIjHn3evHgiUAH7dmzpvTJS+XIxZU6Dkc1pEza3T8q0YIYOOOszOM+lEX+FCwgXBNNiOVtk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635433538; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=bgN4VtmbpKha1U3dbSRWObWfSCBYh9C5Ynebd+aNbtU=; b=EsRvwfX7yqbroY9i06XgZLZDy/GssA0XW43FEHKk9ghDq4Wru3uWkCpFwaWMEk21zYmjNXbUEkomzj0/OvBr3e+CoGHz0hMbXFrZJyfOk7r/z1VIohbhKfmR3djnmigJYhHQHFfoMGKvApdLuIWHp+x560tO9dSH9bP57xNbKoQ= 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) 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 1635433538592831.5681915690261; Thu, 28 Oct 2021 08:05:38 -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-447-eIgDGdtmNeSwNwxjjUWjsA-1; Thu, 28 Oct 2021 11:05:36 -0400 Received: by mail-wr1-f70.google.com with SMTP id i2-20020adfefc2000000b001709de9b770so2235204wrp.16 for ; Thu, 28 Oct 2021 08:05:36 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id l8sm4265906wry.43.2021.10.28.08.05.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 08:05:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635433537; 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=bgN4VtmbpKha1U3dbSRWObWfSCBYh9C5Ynebd+aNbtU=; b=HaH51swt1ODVTWWKnsEH2naSiT2Nl1QnPf2/Dv294+OqrNtBkXmN+vnYFEyQL3CTzoiBRE hv+IwQPHlb2xDLRIffSLxUpABkC6bWKj7EYhrrDf/xNGJOBsm9SiZ4ZGsaL2sC8O61D8nV ynK/lxz6ecFJkiEGn4EfNZY39lB0h0g= X-MC-Unique: eIgDGdtmNeSwNwxjjUWjsA-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=bgN4VtmbpKha1U3dbSRWObWfSCBYh9C5Ynebd+aNbtU=; b=ZiR0n/Otv+W47IBM5xa3ION9pyuSo1Cs77JtTAuTTOSl4oKzlnfSInlZBlkMOeRbtJ IUfP5KQc7BG0Dr3Hyn7nH41g2Os9h+mED7dxkRlsSZfIbIBxWt5MaQiUhoWNm7NH/TT2 xy9UxH+O+jFSlT3iWzBT702lwUntjoHPWGAAJgD5Wy72vFZF6yW3oUn+aZPZw/3P4Wbe UhzLhruP67zUQeXoUHv7uFpcz7OZgbbs4YU9WEkYVJDheVgmiCjW6U7ZuRUT+lQxrCEp wWC5qwt9Fh5ai/etuC0jbtQtP2YnFf8Xyo05qWj6yTUy0gYvy6tkkcMV99CGnGTOrDp7 mPig== X-Gm-Message-State: AOAM532qv3fnpLY9AKDRliIE03+Uh7zRPUZsLWdDgeskjODsXR5x4KBt /xmYQ0ZdBb9GDBtWRB2xrGQU/Cy8GZPzuocSqXWIEdS6ZinpM4BSp1tGKdaIttzrsFuANTC0/MJ 6QgPkoB3fGQaEwA== X-Received: by 2002:a05:600c:4ca9:: with SMTP id g41mr5044386wmp.139.1635433535256; Thu, 28 Oct 2021 08:05:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBY6nM4w+6cGO0BZPqNwsdGY74MpF1H5H5JYsXRWlFcytsIqWLK8OMU19gFFGgxqk/oSM8Fg== X-Received: by 2002:a05:600c:4ca9:: with SMTP id g41mr5044197wmp.139.1635433533600; Thu, 28 Oct 2021 08:05:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Yanan Wang , Eduardo Habkost , Igor Mammedov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/4] hw/core: Declare meson source set Date: Thu, 28 Oct 2021 17:05:19 +0200 Message-Id: <20211028150521.1973821-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028150521.1973821-1-philmd@redhat.com> References: <20211028150521.1973821-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: 1635433539112100001 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 --- meson.build | 4 +++- hw/core/meson.build | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 2c5b53cbe2e..2eb76c187c3 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() @@ -2805,7 +2806,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 a829cc4245b..4d04069f85f 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