From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17A8DC433EF for ; Thu, 28 Oct 2021 15:14:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A59F761130 for ; Thu, 28 Oct 2021 15:14:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A59F761130 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:45380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mg76g-0002Ga-Od for qemu-devel@archiver.kernel.org; Thu, 28 Oct 2021 11:14:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mg6yL-0006ji-63 for qemu-devel@nongnu.org; Thu, 28 Oct 2021 11:05:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:33452) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mg6yH-00078l-SM for qemu-devel@nongnu.org; Thu, 28 Oct 2021 11:05:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635433536; 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=WUBXmjcwI5YDMjaD2tpxBKq1E2IYtqo1lsbJs8NKAd5jpz9V9TOJAQD9AHN46fGFuGK/uT IQ2TeE48U0E5FxK56rXwemKP9sgpKTlow4jPJTmnLEchXkY2CFJzIYZFLdgdr4Z/KnkqD8 1CLfQXSUti5k3PkuEdOl1Yrpfkel3Zs= 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-188-f_1ua9ihPxuGDV2o8o3dHQ-1; Thu, 28 Oct 2021 11:05:35 -0400 X-MC-Unique: f_1ua9ihPxuGDV2o8o3dHQ-1 Received: by mail-wr1-f69.google.com with SMTP id d13-20020adf9b8d000000b00160a94c235aso2246908wrc.2 for ; Thu, 28 Oct 2021 08:05:35 -0700 (PDT) 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=VLrOcDrs+SmaFdazM59jjwtd/i6vxkoa2zRcP/wRpeCrAf1qeboa3T7zDQ7EA3XtN7 ipYmijZJUhq/CZX/mGjBz/qJkpaJZOvpcH+C0rDHt+ZMhLLYtmA1yJWO6Bj4G501evCF LE1C0/OTNhKFMKVkLQ8ZcLAu+TyvtJEo0QDye6WGAaebiWfODi8hlGIxA0Y0gTuhDvY0 ONtoVMGFzlS6SljI6WKUEhfAQa39AKw4QWMVlkJoNgnE57rPq8eX42nIkyE784rdJqRg upfrCoCr3fq1poA3muhj3GEmDsFmjtVPqTW0MZizENPqmDtNDkuUt9AVfQptp0Q5FoeR qJhA== X-Gm-Message-State: AOAM530M/Dm3/uTHug79qN4xNXHtHlgtCISW/ryz7TTkMu8ORKADV0Hq l0vZOPycCL7Tj/hmGU8J0CD8plyQnITspkUXg9y9Rdvb9BoAH4mOYLE2uCDtq/ZKxKw5ySmmILq TOzcjnTUS4nCdufjQrOBTukljvrihHc3zqaW4RrS+UoN4DcATPQXRD5PiLrC+KKt1 X-Received: by 2002:a05:600c:4ca9:: with SMTP id g41mr5044235wmp.139.1635433533876; Thu, 28 Oct 2021 08:05:33 -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) 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Yanan Wang , Igor Mammedov , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é --- 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 = ss.source_set() common_ss = ss.source_set() crypto_ss = ss.source_set() +hwcore_ss = ss.source_set() io_ss = ss.source_set() linux_user_ss = ss.source_set() qmp_ss = ss.source_set() @@ -2805,7 +2806,8 @@ chardev = declare_dependency(link_whole: libchardev) -libhwcore = static_library('hwcore', sources: hwcore_files + genh, +hwcore_ss = hwcore_ss.apply(config_host, strict: false) +libhwcore = static_library('hwcore', sources: hwcore_ss.sources() + genh, name_suffix: 'fa', build_by_default: false) hwcore = 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 = files( +hwcore_ss.add(files( 'bus.c', 'hotplug.c', 'qdev-properties.c', @@ -11,7 +11,7 @@ 'irq.c', 'clock.c', 'qdev-clock.c', -) +)) common_ss.add(files('cpu-common.c')) softmmu_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) -- 2.31.1