From nobody Fri May 17 14:54:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615762392; cv=none; d=zohomail.com; s=zohoarc; b=MTjbgWv1nOtfSBJKkxdWnSJjGiebG18Sd8SMtaVmSj2ibUQrkj6F0sNHAheyRL8Vt+jYyoDXhNAsHcGeMiDF29pVElofpj/kXwE+bz9aj8+iyqjY0ThutNsYZCDe0eejnhOKoBmtlJuuZCK0mPPkgZJXMGjpHbbPozuaoY/sWKc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615762392; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=phsPrYfKakOJB7z0iRcHLh8T8bwjcghz3J5ilQl+um8=; b=Tu9a3OSMRBOn4yKiqPFGWOMKtbn0dn7jKqXRLpnTwe+tyM2Oy5YA4fl+eGr1lfxkWrK6hfiOCybO69C1TwZ7L/Ma1vVHJpu3k67wt90Z6TJo3AIxFLhg1h0O0zJqc7Cemcols0LQ1onu3pNdYGaTBFaZzLF/bl4t4MTtB8GXfXU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1615762392490904.2952074355442; Sun, 14 Mar 2021 15:53:12 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id f12so7751301wrx.8 for ; Sun, 14 Mar 2021 15:53:11 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id i3sm17502299wra.66.2021.03.14.15.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Mar 2021 15:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=phsPrYfKakOJB7z0iRcHLh8T8bwjcghz3J5ilQl+um8=; b=i628NyHHNLUnHj63FkvFAwfRAqTr/Ylonf9NGSus30gLsc+fIYxzR9vd+iAYElGTcU 5yPaAM64djs2mMvlS0L8Emrmbjb5AYZubOOL7RSLdCnXulI/ljjvP2O54wQBkLKKAUMb cuIz3YBlmCZWwhMvFwFdoH/mci3d6aO2mPAxMB3SLNrFmXXtphkVcl9jeKsRD0QUA6tT ukCwMxj6Cz9dXmg9OcN7AYkEjuhamW/DVipeFSE7ifZX5zlth4KBC7IWnzDYzLZAvfSu 6VbSNKQwwot5Fik+5aTGeZeWLk98VEx+T8+LAfX34kHrJ+mWycmkwrF3ePH6AVSBdgzU 1J2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=phsPrYfKakOJB7z0iRcHLh8T8bwjcghz3J5ilQl+um8=; b=W0YmyyYUHnRYqEFuGfllMObKjiSiH3xHc4rHLmfLzmV8tT+C5CSDkSIpm854SWGnZ8 dj0WiuQbciL5S5By2wk/N7+FxGo3z6bpe88kiSVQ7xcPMe35zlFa85y3bVlk1p7ZpPY+ XJybfx+XIhl0kxKvGjieOZio82lrI8pmonCqJphA3kM47eDSjtjaJziil6aDk5VXM3hl KjqkzA48H0OlOXn2NRwyYnLZnqvOTx+Eyej1blQwQLsI+N0KxYSf204h84+ya2nt0CmN IOBkTOedishFhK7cCAuI8Imd3nS4JMtvK6Pk1pzcLHvMUue0M8m0N+lBhjo+f1YopNGZ E6+g== X-Gm-Message-State: AOAM532Wwq+DpX3GPJcwb0ka7QlpOQ5D2MltJhoE0iD8Yted+RD/RwSg J6109jLQpo8gBfQMcVoOiPw= X-Google-Smtp-Source: ABdhPJwzrYiQUztinlmZOMjcLoDHDNrXXuJTAPAT3V+KGZySVBcsZgBX9sNL76nFpkMgCXSle7RE/g== X-Received: by 2002:a5d:4fc5:: with SMTP id h5mr25329669wrw.33.1615762390782; Sun, 14 Mar 2021 15:53:10 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alexander Bulekov , Paolo Bonzini , Laurent Vivier , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH] qtest/libqos/meson: Restrict architecture specific objects Date: Sun, 14 Mar 2021 23:53:08 +0100 Message-Id: <20210314225308.2582284-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Various libqos files are architecture specific. Restrict the ARM/PPC/X86 units to their targets. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/libqos/meson.build | 51 ++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build index 1cddf5bdaa1..817c2cc2c20 100644 --- a/tests/qtest/libqos/meson.build +++ b/tests/qtest/libqos/meson.build @@ -1,4 +1,8 @@ -libqos_srcs =3D files('../libqtest.c', +libqos_ss =3D ss.source_set() + +libqos_ss.add(genh) + +libqos_ss.add(files('../libqtest.c', 'qgraph.c', 'qos_external.c', 'pci.c', @@ -6,18 +10,6 @@ 'malloc.c', 'libqos.c', =20 - # spapr - 'malloc-spapr.c', - 'libqos-spapr.c', - 'rtas.c', - 'pci-spapr.c', - - # pc - 'pci-pc.c', - 'malloc-pc.c', - 'libqos-pc.c', - 'ahci.c', - # usb 'usb.c', =20 @@ -39,7 +31,28 @@ 'virtio-rng.c', 'virtio-scsi.c', 'virtio-serial.c', +)) =20 +libqos_ss.add(when: 'TARGET_I386', if_true: files( + 'pci-pc.c', + 'malloc-pc.c', + 'libqos-pc.c', + + 'ahci.c', + + # qgraph machines: + 'x86_64_pc-machine.c', +)) +libqos_ss.add(when: 'TARGET_PPC64', if_true: files( + 'malloc-spapr.c', + 'libqos-spapr.c', + 'rtas.c', + 'pci-spapr.c', + + # qgraph machines: + 'ppc64_pseries-machine.c', +)) +libqos_ss.add(when: 'TARGET_ARM', if_true: files( # qgraph machines: 'aarch64-xlnx-zcu102-machine.c', 'arm-imx25-pdk-machine.c', @@ -49,11 +62,15 @@ 'arm-smdkc210-machine.c', 'arm-virt-machine.c', 'arm-xilinx-zynq-a9-machine.c', - 'ppc64_pseries-machine.c', - 'x86_64_pc-machine.c', -) +)) +libqos_ss.add(when: 'TARGET_AARCH64', if_true: files( + # qgraph machines: + 'aarch64-xlnx-zcu102-machine.c', +)) =20 -libqos =3D static_library('qos', libqos_srcs + genh, +libqos_ss =3D libqos_ss.apply(config_host, strict: false) + +libqos =3D static_library('qos', libqos_ss.sources() + genh, name_suffix: 'fa', build_by_default: false) =20 --=20 2.26.2