From nobody Sun Nov 16 23:02:12 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=1601982765; cv=none; d=zohomail.com; s=zohoarc; b=YBsyWzmsnipGA9lErN1r5sJFMQU/igxR9YrmUYfIqyJdBNrXzn8rb4fnxMETfIec72S/Mr2cRAc2IdT6vFaMrIlvaPk/5APsx8KJeF0RuEuugH/uZJPLGgZMeXF9ThI4t6H/A95QP5w9Vprhm9CGnq6dK4icK+jO+nqqSoc0HSM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601982765; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=8HCla72Ii7oikn9r1xa5R26+ZMQNPzJ2LVPz4WtA74I=; b=Yjt8BK2/wORxnVhdmxoUWVRZ/DNLl3yH0CqmHtZCMwbt5jMsg8/ivoWpg+cdW2m6VviI1urfo4i1U3ybAPmif0LKtJITYHcEDf+fS9K5aEJebfivEUiUXZxElXUoNia2WtLTxOaetRaVm1ovFvFhwwTVY+YQ0CSCrwrjzDm5xFA= 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 1601982765981298.9368429787829; Tue, 6 Oct 2020 04:12:45 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-124-M5ljCmjdPBCY8aLnWwrm6w-1; Tue, 06 Oct 2020 07:12:43 -0400 Received: by mail-wr1-f71.google.com with SMTP id l20so1984974wrc.20 for ; Tue, 06 Oct 2020 04:12:42 -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 a5sm4026965wrp.37.2020.10.06.04.12.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 04:12:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601982764; 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=8HCla72Ii7oikn9r1xa5R26+ZMQNPzJ2LVPz4WtA74I=; b=Zk8YOeo5bgxTYK/jqetSwbwn2VQTRXngRPUswoZ+qp83NkLvh+R9zCJnI/K6DQhcQDkxrm Ske3BM/q4QMmtrOJ/oOdvc011Sv+ryODPoNnB5fwDCKhL6GSmiJaOJyGmlkJTwGxvG8+xd BbXjsr3d8ptNYk3AP0XatxJ6sy4ieGA= X-MC-Unique: M5ljCmjdPBCY8aLnWwrm6w-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=8HCla72Ii7oikn9r1xa5R26+ZMQNPzJ2LVPz4WtA74I=; b=ksbF4QZivtC+8TgXEhz1D5FHbu3AiyXWGYmBuclkPBoHUSz7kDmbOeMTIzxWOFyD7W j9qo37U5P1QQR1m+GzzOsr+vUlk3yxd6WgzeS4tDYCkDiUg29Tx9A1rfLwjuGaAzH88L BWS2qLlyj0KopZK8DlK2hqV6STlSjI1aeK6oPjth3s4QFs6/MhOaaNGLqLDrafAQ2im2 bTuf11d3Hi0KWdxf+BPxWr6euyL6S+i4yA6dDGkaEAUvT/kPOGqbnblH1AV8iF1OePqB 9OCt8f4IA7EWJWojfYLgcJMrVKrH3xyeCxWJgOBGnFocnqjxR0NoCpyTYn5y3UXNnQRf el1g== X-Gm-Message-State: AOAM532hcd7O6DbNqSiuTF19VgfkP0aHQWngjxovH/0p6MY7eiR5tyS1 FCSU+huAKFvebvUQMpvuPeLY0gCnzlHeDt6V1PfVOypNDVSUe5TwWcNc307OMrPmZbaDvUy/LWq sXNPyYF7YH0FCEg== X-Received: by 2002:a1c:c908:: with SMTP id f8mr2390569wmb.28.1601982761825; Tue, 06 Oct 2020 04:12:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlneto9wIwjvwYY63A2wQ5BaGTqaKUG2HUWPejnDShumhTXIWs8vBeDDYbU6Ra3PjrBL1Yhw== X-Received: by 2002:a1c:c908:: with SMTP id f8mr2390549wmb.28.1601982761662; Tue, 06 Oct 2020 04:12:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Juan Quintela , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 04/10] hw/core: Move the creation of the library to the main meson.build Date: Tue, 6 Oct 2020 13:12:13 +0200 Message-Id: <20201006111219.2300921-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006111219.2300921-1-philmd@redhat.com> References: <20201006111219.2300921-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 +++++++ hw/core/meson.build | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index fc7792b769..ccfa3e9531 100644 --- a/meson.build +++ b/meson.build @@ -1346,6 +1346,13 @@ 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) + + foreach m : block_mods + softmmu_mods shared_module(m.name(), name_prefix: '', 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