From patchwork Wed Jan 18 07:52:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 643673 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp1617578pvb; Tue, 17 Jan 2023 23:53:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXvhSQIXLl2j/j8ZUlPP3e7o4hRN4DXsy7Suhc4snDJQTxFVBrFtGOonDtMgKTCe5CIRWBZS X-Received: by 2002:a05:6214:451b:b0:532:ab2:992f with SMTP id oo27-20020a056214451b00b005320ab2992fmr11380081qvb.3.1674028395791; Tue, 17 Jan 2023 23:53:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674028395; cv=none; d=google.com; s=arc-20160816; b=JVQfJGmOlJ/RLQHENWEjXt8VA7P75hFVN+LeF/+TMwTld+pOV714WiBBwl0I2UHaVN di70ys1ekzBjZAAsJRlaEiGP3eaegp+W7QdbHjOj4WfmNDxDHuStHkvpUuk0rFHzt1ae jCa/YrLcx421RbmHCPbz3PJY2po1nabM3Yc6IdEAXM3/ODFhtZAfR8dqtWarBTVSC8Y6 m4yeBqooV+oig0SCYIazvnNtCWlXyFZFmnMEG6Tbs8P3uIzIKO4HpKFhFO0X+MMw9yAI BKFi+Qe3T8WvG8yriAcpeaLIzh/3plrWcbS3fTR0mwNuG1vomTt7y3esY0iyxASwQuAi B4XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:ui-outboundreport :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=cNH37D7TtJE3GalcByA3Ar4jVC7hzo8NXDSYXp4XMmw=; b=S2wgx2L6TxxOq3rEX1RkZFjKBrRTdrsLhnUvEb7OpWCIQ9Off2PnMvu1DL98dj9lxq AzMo+sSdiYzFXt/TxpL24W271Uq3jCpyoTTOycxHL/912SXLhpOcXQFvTl/JFEc/uVMa ReOEwJMnPABcOgWmx0U7EIvp+GPwhhom8+jlQdflwp0iWef0lnRd47GSmWAPKRVxVjN8 XSB+WPCvfp+PLbu5z9tJqhTXvabb76sh6EtpOYq2C2BJVwsMSwSmdjNNVBVqZUa5FQsy hhb1ZdyGJQzvAp4Zxbz/gsR0YD9d5pPH1q16r0574tich/0hTnYoqwQuPtzGZfu47YjG Q9NA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v20-20020a05620a0f1400b006fc3fa22f44si19882612qkl.221.2023.01.17.23.53.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jan 2023 23:53:15 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pI3FW-0001rE-Jl; Wed, 18 Jan 2023 02:52:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI3FU-0001qE-Cx; Wed, 18 Jan 2023 02:52:44 -0500 Received: from mout.kundenserver.de ([212.227.17.10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI3FS-000223-Lq; Wed, 18 Jan 2023 02:52:44 -0500 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N6KQZ-1ogIiV0IZt-016iZS; Wed, 18 Jan 2023 08:52:38 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Richard Henderson , Laurent Vivier Subject: [PULL 02/15] hw/display: Move omap_lcdc.c out of target-specific source set Date: Wed, 18 Jan 2023 08:52:21 +0100 Message-Id: <20230118075234.2322131-3-laurent@vivier.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230118075234.2322131-1-laurent@vivier.eu> References: <20230118075234.2322131-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:S/TozmtnyahcoSb05PRpxPBFnMLH1qwj2t9eyJdPJUH1VuXwwn/ kAgkAii6MNoq3OXDEF92le99lcIxq/aYLBdGZqEdq/itUgFZS7U3OxxknECeWFujByPAFBj aycMr+v0zgk/xwaI+9hs0uLskFinuvkdjdVigH+1H0UNXOZwF066xHiCzBxdpdKVkORTGhM 5lvtaxdh9CEjGv9pH/1HQ== UI-OutboundReport: notjunk:1;M01:P0:gfiX2UupAu8=;//Tax+7LRtv9O622qnr/EW77bdE VapoLofZzcvaKmjEXhTPtxP+dIbcW2biE4np9s8YfXXtKlsaCOfTrjqJjofpCKIevZwYJTrD1 8s6lWmul/FNaCbSly9mEqX8baDSPmHffumIwegF37CQa7m04ymVzAGBCb2xe3jPMBmuqusOyh yNekvQQIy7RY26tjguWvVGyfMJX9w5HjcM/SqquHu6s9tcAgmjfKW+/VLYP2Wriz4zVqJWMig kzVAeRo+MWfBE70QIlrGOGNRTeqXo28V+QMMrW/HCNMiwKfz+gN/ZJu7gBK3e+xxcQyFR7fth ldSAP5RxAzUycUmBDN8EUScaJewHpUYrdVUbLzrRVppXNVpzC+GgObmD2vsbAKW2mNRFuK7Q9 KUIVXcUqxxwdEpVgu63cdER+t9cJGpsF1EwW68wb2E0tk+AIRk4RpALLj52PaFeA2wPAgcoCo u008wN+oN8AjgV3vPnltMTd+Ucv9x9fuqW95Pkdh/Xp41oZA7Dqns3gs5EmN0lzkh3k3h6Xt2 jPVySmolZTR0lma41fXONYg8tv5pkcPbZrKmLil2qD/kKcC9Ls9o3Jb/uKvGBTO79VaOdXM/J 9A+2C56fIsxaJQK/Q1GyZLq5NEj1FVwSfQoeoudlpV5oJ6WQQu018qv/TOwvQTFzVmjeF8YC9 Hdosyi2CRjR+ydlC1Zktw3RSu/qzBxu0LwpqUR+rTA== Received-SPF: none client-ip=212.227.17.10; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé While only used by the ARM targets, this device can be built once for all. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20221209170042.71169-2-philmd@linaro.org> Signed-off-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20230112134928.1026006-2-thuth@redhat.com> Signed-off-by: Laurent Vivier --- hw/display/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/display/meson.build b/hw/display/meson.build index f860c2c562ac..f470179122c5 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -115,7 +115,7 @@ if config_all_devices.has_key('CONFIG_VIRTIO_VGA') hw_display_modules += {'virtio-vga-gl': virtio_vga_gl_ss} endif -specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c')) +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c')) softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-vga-stub.c')) modules += { 'hw-display': hw_display_modules } From patchwork Wed Jan 18 07:52:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 643674 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp1618210pvb; Tue, 17 Jan 2023 23:55:21 -0800 (PST) X-Google-Smtp-Source: AMrXdXtuMLPfcm5xQiF3WBLGNqIYuwkjbR8tgN780K4nsdKnv1s0LIraLun4RJ4aXQmAr+zpcBTh X-Received: by 2002:a05:6214:3291:b0:534:6aff:e5ca with SMTP id mu17-20020a056214329100b005346affe5camr9000237qvb.1.1674028521502; Tue, 17 Jan 2023 23:55:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674028521; cv=none; d=google.com; s=arc-20160816; b=pNKOubWp4ehLiGgTYNKmhkw1G/lfgnG/bq2jnOMybfQg/nJcOcls4riq1F3FGLz2B3 af8rKIeY1xcUr7QYdWyt0cUfS/vL2TWvBWapHjZD/WFqjzTb431LgzCMg6hGaQx473HI hj00r9n/MRcoHKcEe15jvYs8Juesvb8wPzF4yOBII0pLqw1ELVZ8/WSl9alSUUqhBOFk IA6puai7QSh2MccaMp9aFsN4b53PEex2ou8POgySvUZJjS9tXJzDSM9eJsyosQ2EqP4P SWn2BvcrXwF4xkRE3tZrr9Cz+gua2vgQvFbKFDcmrKgppErM3jo4WLFjE4bHtuOmGPuq uiOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:ui-outboundreport :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=T08FsbyzqJZ9cYm8ZcojC7PcW1dHuPQ1I2GlEdi92Dk=; b=0iXJKjAT5pvs/+Ld5lUR1DUVhH+tN1bRseVtAEH9p+doe3oPW8HLVDRH5hxdlVTlz2 xfObkY9t0csVnYMh9Jz02UMGvDqOB8EwbSo6xKytJgMkV/AukohUkgH6alYjNkZJ9utA Hr55az45c28RtxUHmtsTVDfcTlu3VRAypO9CCoo4h8qO/I4GljuWwW2H/FXG66SAOV7F JBqH2Zr46j2LN6XVQvIkeFbSPQKTBg421S2oMH6WnA6VLj/nZLoyf7V60YROHDxR8JwT t3UJCyr0gxl0fucwS7MS13qVybj8QveX/m3KtHTI8Ys7np575pRthv9ndELovTaOr+cc iEog== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f10-20020a05620a408a00b006fa2e7dc051si22180451qko.482.2023.01.17.23.55.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jan 2023 23:55:21 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pI3FW-0001rJ-RI; Wed, 18 Jan 2023 02:52:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI3FV-0001qh-H2; Wed, 18 Jan 2023 02:52:45 -0500 Received: from mout.kundenserver.de ([212.227.17.13]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI3FT-000228-3r; Wed, 18 Jan 2023 02:52:45 -0500 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MTiLj-1pA79X2nRl-00U62E; Wed, 18 Jan 2023 08:52:38 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Richard Henderson , Laurent Vivier Subject: [PULL 03/15] hw/intc: Move some files out of the target-specific source set Date: Wed, 18 Jan 2023 08:52:22 +0100 Message-Id: <20230118075234.2322131-4-laurent@vivier.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230118075234.2322131-1-laurent@vivier.eu> References: <20230118075234.2322131-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:1qiBwNSzoDFSblx92XfC9mUCpEenPVaYdBNiwFjugvOyKjPA5hL LgmHsFOfw+E//015rNZ0BYDhBY+pXF9c0d8bAlkEnGRwliftxTTSCCutOgsrwuqyxi/qjWl AnDS6CoBQnkh3KOtOl4StOFGGKZ3h2dN6bW+WxrcZdobgtpwrKCOJRIdozXwWjjX1qUjwxn HvcQCQHtmujedudkICGsA== UI-OutboundReport: notjunk:1;M01:P0:1TT3JVM73m8=;FYEu2Fh8oLkpn833JLyzydo9Dmc hq4sNnIYeXEdEQ3dx4c3g3JGpVnGDU9Zo9YuPURnMFmKNLgC4APQw6aQN+tKhhw2yPxNoFRDm Fdwcy3rWX+3RZykv3Pv4atkJld8+ojuYOFZ0LXeoDYfN2k6jVpoPTQa6TYf9pQvSqvzIJDGbu vJuM7b+CwDp41KdKO91yl8PAJ9+pE+FRfzvSzV4vtkNMU+fCFHhsP+7h65fiWNXcuD0DOq6EJ 0Q+NBzo8MVStBV/AMMQ3/D5UctoMbmC7KGnfYtvOAprmdwox/Sili5GB7S/7ZZtJuHzt9f8tP K4Hs2HAD2wwe9QKkeyAgyMBeK3uQDSWRvLLOKdkK0y3E1JPrAnglwtZw9vYruVj0Vl2LxGomB K3Wtlfg3qXz/Jz2kBVrOty+tduvv7LDQYVRdewgP48J0KdkuttFkanj5z5Y4QJfxCGiHpnMlq rEwaclKt+gCg3LfYHma1mQ0KtiFHfQDvS91H5iUE4UfnXF+JuXC7eQ3oyr2thQgx1Ax6cQbhU d4BoHJBLPOB9lUDUMRsb0bOfAiCr2PtwzZ4glQ3FNiln0c1Gv+4pyX5aoU2R6Mvze6u5OvTBp oII8gMWKDlHhyQn2VSEiu1nHleXfuI0w7IUnydGStIreMSZfihEsTO/cg2VIMJEIky3H2WyHD UPZxO4Yz/QLW1E7HLqNScUibezsmu95f1zMB8uvsBA== Received-SPF: none client-ip=212.227.17.13; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé The Goldfish interrupt controller is not target specific. While the Exynos interrupt combiner is only used by the ARM targets, we can build this device once for all. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20221209170042.71169-3-philmd@linaro.org> [thuth: Change patch title, and also move 'exynos4210_gic.c'] Signed-off-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20230112134928.1026006-3-thuth@redhat.com> Signed-off-by: Laurent Vivier --- hw/intc/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/intc/meson.build b/hw/intc/meson.build index cd9f1ee8880f..0988cae8ab06 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -13,6 +13,8 @@ softmmu_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files( 'arm_gicv3_redist.c', )) softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_pic.c')) +softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_gic.c', 'exynos4210_combiner.c')) +softmmu_ss.add(when: 'CONFIG_GOLDFISH_PIC', if_true: files('goldfish_pic.c')) softmmu_ss.add(when: 'CONFIG_HEATHROW_PIC', if_true: files('heathrow_pic.c')) softmmu_ss.add(when: 'CONFIG_I8259', if_true: files('i8259_common.c', 'i8259.c')) softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_avic.c', 'imx_gpcv2.c')) @@ -39,7 +41,6 @@ specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c')) specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) specific_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) specific_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_vic.c')) -specific_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_gic.c', 'exynos4210_combiner.c')) specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c')) specific_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic.c')) specific_ss.add(when: 'CONFIG_LOONGSON_LIOINTC', if_true: files('loongson_liointc.c')) @@ -66,7 +67,6 @@ specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('xics_spapr.c', 'spapr_xi specific_ss.add(when: 'CONFIG_XIVE', if_true: files('xive.c')) specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_XIVE'], if_true: files('spapr_xive_kvm.c')) -specific_ss.add(when: 'CONFIG_GOLDFISH_PIC', if_true: files('goldfish_pic.c')) specific_ss.add(when: 'CONFIG_M68K_IRQC', if_true: files('m68k_irqc.c')) specific_ss.add(when: 'CONFIG_NIOS2_VIC', if_true: files('nios2_vic.c')) specific_ss.add(when: 'CONFIG_LOONGARCH_IPI', if_true: files('loongarch_ipi.c')) From patchwork Wed Jan 18 07:52:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 643676 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp1618611pvb; Tue, 17 Jan 2023 23:56:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXsk6f2bMDoMW+WPdxUmTll1ZJb02My2M1Ym8n4wVpucuAoiC0+ezYDxV06vMoN8EAoIn3dl X-Received: by 2002:ac8:7602:0:b0:3a9:8c90:dcd6 with SMTP id t2-20020ac87602000000b003a98c90dcd6mr7185536qtq.51.1674028611717; Tue, 17 Jan 2023 23:56:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674028611; cv=none; d=google.com; s=arc-20160816; b=jrXFSHppwXdPd0ePKL9p02KTwBlmdOydZFV5MWVeCcvwTI112Kg9WUb8GSJx1AymFs B+L8DBdtxYUSN2gd7HLQ2PjgwRbmsWm3s9H6VdZFuYV0h2VjNvnXk1k9ex3AOdYZANr4 x1tzfKOj9Y7chj3fJClouMXqh4IR3REm7kGqPT+QKmZ2MqOthd0v5lCjtfIeMAeNwz55 +Hmvo9q5shFcjypghYXi7vbZM2GlQQIdJdgK+yMI0DCevWQb747ML7uyCwHiQNQcfQGN hlH5oPrTji2R/RaxE8UYc+b77uNBw4T/xLoy+HfwXCu4OmsHSTm6w5yXQrZZhw8wouH8 a0IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:ui-outboundreport :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=IkD3KNuDcqGDLaprU6+nxa8Qd6N4dEfqjXhYijjrLg0=; b=OnlaLpIbjjv4JFQeIZXsqfGsJPHnHSK8BQbDYpao3eqz5wijkYmKe8xs8L+vctFFuB 7O9rcP8pQggYKrTE4mSkRGyoV/DCQH0xbvnxZkvjCqPd1n2uXooQ4AB/iV1u5QzzLOUX tHUFy68yExBVFOwSiLDV7bGSEh29CWA7oUj3ujQ1A4ChxrDRCWY5D5lnZxP8dRFGLFT4 UCMyTiuCAV++X0BQi1aEXzwFRx7UF+RwSUX4m1M6K2gQqRvI2BqLHFJBHmcDBtp1Qsxr zVsL98qaW8/J3a6axpUDQqwqUBghzw5hNTlohhhUzKQSHHW/G2Zn6TY1mTfz8uuvD26G nJ1g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x21-20020a05620a0b5500b00705cb0f9d6dsi14348180qkg.372.2023.01.17.23.56.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jan 2023 23:56:51 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pI3FX-0001rk-HV; Wed, 18 Jan 2023 02:52:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI3FV-0001qi-JU; Wed, 18 Jan 2023 02:52:45 -0500 Received: from mout.kundenserver.de ([212.227.17.13]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI3FT-00022D-Sb; Wed, 18 Jan 2023 02:52:45 -0500 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MKKhF-1p0nkG14Pv-00LoIK; Wed, 18 Jan 2023 08:52:39 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Richard Henderson , Laurent Vivier Subject: [PULL 04/15] hw/tpm: Move tpm_ppi.c out of target-specific source set Date: Wed, 18 Jan 2023 08:52:23 +0100 Message-Id: <20230118075234.2322131-5-laurent@vivier.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230118075234.2322131-1-laurent@vivier.eu> References: <20230118075234.2322131-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:4hciKJQLb+ncwQShOYcADmPKZxhXHBFuOhNgSrF34KLiGYmKHOp N9JR62WOcIIl4ay54cQuS/eyQ+zjeIGJvwzM0hTDacc3DOQOMVsu+uweCQEOIm5yOS9ZxQL FWbnZD4FXO1bOEcn14wVUZxX341uCfRegnwHtO6tbqfVwFHtSNy+cwjR/aEJIpyizQSan32 SVrcE+0wg7zefnSVobrsA== UI-OutboundReport: notjunk:1;M01:P0:JH/fIg5DEoo=;lkvQwm69xOxRvNeHStBUrLW0hsl yFUvpOEeJqMYlrdSIYeu8o+Owllla7pU9aE0XbV5n2TVbV7HpTmcYlpg0fCfWo07DBcbhUcBw Rn0XdftaI2vunJ3D92JD+gLP1dtwnJwHKX8kUoWiGyIb9YwHeWI19tjFCxP8JJpM2hbSJ/JpD C0CbWYbKNCC/IhvYYwfxK2mLtCKa0WooqA3oZCpZSyqLmrvPKMLG1Z6Y8bfyx1OJi2dd6sH5G 7ygDVog8bCebTZ+Kyu/I7fpK+K60UIP2g5ACpyCjppqQdWc6SQjhn4JO1yNlX8kYGhn8CUeNa PcK3zMIDDFsT9Cb0TWZYsqx1F0zuF4wjWjtDfN776DSuSRfdHf1wShbwb3v53cUFZzncrsKCV ea/aqQbVsnh7deDtX+UKEuoBgVw6NY6UubyDO/nj5ZL9Ysez5xkKXqWN4q/OyBLWxmg2PC25e BbOoFQt+damhwvNcVxWDUP1IGXj3RBwwVF54PEIycCmSXnrU3qDdiv7HTcMqds6aq3pot2FHB 3S9cn3u3TtNdSwUcf27EY7c2gBLsU122mGbAznZd6QjayXP+AdKlKwT1IXwMHzYCJzxeuFqGV xqPTnqg+/Bi10B4YIiqUqdenid2ZXxIJcYqIe1018rNpo+V5eNlriu/j2nF4r55+c9oas0rYQ bf6LLQ1N/F2X49IsSjGKi1dFDBj9p6wuwhrmN92UCg== Received-SPF: none client-ip=212.227.17.13; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé The TPM Physical Presence Interface is not target specific. Build this file once for all targets. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20221209170042.71169-4-philmd@linaro.org> [thuth: Drop the CONFIG_SOFTMMU statements, they are not needed here] Signed-off-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20230112134928.1026006-4-thuth@redhat.com> Signed-off-by: Laurent Vivier --- hw/tpm/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/tpm/meson.build b/hw/tpm/meson.build index 1c68d81d6ab2..7abc2d794a84 100644 --- a/hw/tpm/meson.build +++ b/hw/tpm/meson.build @@ -2,7 +2,7 @@ softmmu_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_tis_common.c')) softmmu_ss.add(when: 'CONFIG_TPM_TIS_ISA', if_true: files('tpm_tis_isa.c')) softmmu_ss.add(when: 'CONFIG_TPM_TIS_SYSBUS', if_true: files('tpm_tis_sysbus.c')) softmmu_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_crb.c')) +softmmu_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_ppi.c')) +softmmu_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_ppi.c')) -specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TPM_TIS'], if_true: files('tpm_ppi.c')) -specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TPM_CRB'], if_true: files('tpm_ppi.c')) specific_ss.add(when: 'CONFIG_TPM_SPAPR', if_true: files('tpm_spapr.c')) From patchwork Wed Jan 18 07:52:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 643675 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp1618250pvb; Tue, 17 Jan 2023 23:55:32 -0800 (PST) X-Google-Smtp-Source: AMrXdXuVAlib+65NNOChA+2BVVcnFx+Gi1Sx29dxcQuD/sedMNwYUxWSrD4ZOogrgJqdnf3K3wPA X-Received: by 2002:a05:622a:2611:b0:3b6:3512:eec9 with SMTP id ci17-20020a05622a261100b003b63512eec9mr14262623qtb.51.1674028532129; Tue, 17 Jan 2023 23:55:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674028532; cv=none; d=google.com; s=arc-20160816; b=SLZbE2h6x4I56HKu1Rfvw98j+utlZuyzRIInO4bj1fl8BnPKeTCE9dVEU0Z6w/3Yce 4RqrcQA44dLAdzUJftMVZqkWXnoWBM4QpWVQV9IAV+F6bI6XnrJFpZMJ1piD9SGJnyyb nA5O0KI1KGsfpZGnLG+IisKtxChLOmmJxUsgAdD1PnMZ6dmFV78ZW1LclI9aYfcdkx8H cOoxm8LF/2yIiu7CJbg5+nqktmvLkIQ2ZlvOzYM3glMU3tcUkpnURdWMS+GkOg7m0RaF qexsdcYTMLEhVdj495QnGYlGQKO2kbDEZndAH+oAXW14jhmTJPetsDNwv/3l4+UK+WpW AdNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:ui-outboundreport :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=7tpu+rNSYIISRskfvIwrDtmXiY1HGMJyT9M5i30jocE=; b=xn06S4cvKI2u51h6eKdR3o8sIL0WB+y74oBG9tnbdb3LUdpe3f/xmHlVWeWqV0rlGa SNFfUlrVrVMxis0qPTpjmLiVdFTCxIEvEkBeIhwI1HNJCyQNxsisudVlFCbxRsnLKUod mmA+Me6rn/ZJH9lIU8utcmuUbRF7NBMSKL4qpZjEjCP7LFock5atChIeinkhhI8xviSh nCDJRo2/hW9osYkJ5/fji1NyHfUsy209VBDAxaEG06tYNfh57F79pS2OWPDJaktOEaYS bejV0vFfOcoKEDAXLrHW1b7Y3a1OPKN/sGGfHWbGVMVv5Zt2VXIp2ylkTysJh0oLaVRc BIPw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w7-20020a05620a424700b007023a700d33si20684290qko.617.2023.01.17.23.55.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jan 2023 23:55:32 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pI3Fb-0001wF-KS; Wed, 18 Jan 2023 02:52:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI3FX-0001rn-I0; Wed, 18 Jan 2023 02:52:47 -0500 Received: from mout.kundenserver.de ([217.72.192.75]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI3FV-00022g-Kd; Wed, 18 Jan 2023 02:52:47 -0500 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N2m3G-1ob3W73gM8-0139ff; Wed, 18 Jan 2023 08:52:40 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Richard Henderson , Laurent Vivier Subject: [PULL 05/15] hw/arm: Move various units to softmmu_ss[] Date: Wed, 18 Jan 2023 08:52:24 +0100 Message-Id: <20230118075234.2322131-6-laurent@vivier.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230118075234.2322131-1-laurent@vivier.eu> References: <20230118075234.2322131-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:/OQIQb7uRJgxHX13qherXBPcc5p2JRq2AEBDdJrVm27XhjKrLPq E/wqxm2c5ZnQpXaH8vBwnrVO+5cyuymwxgNoaBZ78MQDSXIMnFD4jn1rJpZkWyeMaK/gpru t2RNkiy7e7jjWsa2vUoEYSav+GhdtWaPqUuKpctCrt771eXJ5LyJNRjMXT9Zl7OpStGXJ+R h4RuayQMkBBvYGQ3o/Dmg== UI-OutboundReport: notjunk:1;M01:P0:av8+fDtjqxQ=;eHirFiRHPDcEGtj7yt1jxZq8NdO NllPNG4WWSpAkpywBPcwsov5G1PO7oxyARtWMXZreNdaFjNnvM23ijKfKJOE0lUId0Xrj44dk zht/Ja6g6MFgRfeBrw79B+GjFbHCN8ea6oI1jgZr6BjSSko47lpFjNcDBGjM/kn2GW0OsvOb6 zm/CU1xloNt82D2iRUHTI/MncniiV8YOgEfaWWY/HCDzq9w/SOfIDN5BR9DvYmAn2fFiZ6SXq VvfC8Nr3/4C6s5237hdL3pyHWvxKU5mSxmpG0x71w0oNpJllpKjkjG1as/3+Qe0N5qeexOJcM pzVrhuJa9RD5TZdLrx1CCLzWOYTo8mBqJAElG7e0duS37D/EKECJkpwKE4SHq6EEIsbm2MSx9 5aOqD3mywZlm6r1P4L1adRXbbuYei9RR8mL2GSUSqKx3mZcNxsSTKzxBT2ocV3of1mgTbF9xd 93uFYiFZau7sMW3K0biBqoQ3UDSAhHhZ/IYp1bxG+/sjVcqPMwv0YmgbG+KzU6/7Pokh0W3b6 Jqb4mUUF16QL0nDHUTsCuTyMEvsVRCoVGyRHDjvPobkgJnOO67VG+Wko3SyGCkdFSsp1YAu8u Kaf6rNJ5IzK6+LClQvgSpcuKrj63RaizOqldipTl0OBw8d3vOyQvV8B1Rzc7q4GHPt3mCOu+Y xG3obfWlRHDWTH/8QesGDE0/8KjqntW1rjJQIare2A== Received-SPF: none client-ip=217.72.192.75; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé arm_ss[] units are built twice: once for 32-bit word size and once for 64-bit. The following units don't require any word size knowledge and can be moved to softmmu_ss[] (where they are built once): - smmu-common.c - exynos4_boards.c - bcm2835_peripherals.c - tosa.c Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20230110164406.94366-2-philmd@linaro.org> Signed-off-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20230112134928.1026006-5-thuth@redhat.com> Signed-off-by: Laurent Vivier --- hw/arm/meson.build | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 76d4d650e42e..b03604560392 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -3,7 +3,6 @@ arm_ss.add(files('boot.c'), fdt) arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) arm_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c')) -arm_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c')) arm_ss.add(when: 'CONFIG_EMCRAFT_SF2', if_true: files('msf2-som.c')) arm_ss.add(when: 'CONFIG_HIGHBANK', if_true: files('highbank.c')) arm_ss.add(when: 'CONFIG_INTEGRATOR', if_true: files('integratorcp.c')) @@ -19,7 +18,6 @@ arm_ss.add(when: 'CONFIG_SX1', if_true: files('omap_sx1.c')) arm_ss.add(when: 'CONFIG_CHEETAH', if_true: files('palm.c')) arm_ss.add(when: 'CONFIG_GUMSTIX', if_true: files('gumstix.c')) arm_ss.add(when: 'CONFIG_SPITZ', if_true: files('spitz.c')) -arm_ss.add(when: 'CONFIG_TOSA', if_true: files('tosa.c')) arm_ss.add(when: 'CONFIG_Z2', if_true: files('z2.c')) arm_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview.c')) arm_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa-ref.c')) @@ -39,7 +37,7 @@ arm_ss.add(when: 'CONFIG_OMAP', if_true: files('omap1.c', 'omap2.c')) arm_ss.add(when: 'CONFIG_STRONGARM', if_true: files('strongarm.c')) arm_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('allwinner-a10.c', 'cubieboard.c')) arm_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3.c', 'orangepi.c')) -arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c', 'bcm2836.c', 'raspi.c')) +arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2836.c', 'raspi.c')) arm_ss.add(when: 'CONFIG_STM32F100_SOC', if_true: files('stm32f100_soc.c')) arm_ss.add(when: 'CONFIG_STM32F205_SOC', if_true: files('stm32f205_soc.c')) arm_ss.add(when: 'CONFIG_STM32F405_SOC', if_true: files('stm32f405_soc.c')) @@ -60,8 +58,13 @@ arm_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-soc.c')) arm_ss.add(when: 'CONFIG_MUSCA', if_true: files('musca.c')) arm_ss.add(when: 'CONFIG_ARMSSE', if_true: files('armsse.c')) arm_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c', 'mcimx7d-sabre.c')) -arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c', 'smmuv3.c')) +arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmuv3.c')) arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c')) arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) +softmmu_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c')) +softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c')) +softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c')) +softmmu_ss.add(when: 'CONFIG_TOSA', if_true: files('tosa.c')) + hw_arch += {'arm': arm_ss} From patchwork Wed Jan 18 07:52:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 643677 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp1618627pvb; Tue, 17 Jan 2023 23:56:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXtvYy8tvA+YQO7I2Qq7Ox1MZLi0vHBzI5z0QNFwg6hNrxF+GiFFQum9zN1f6D3D+midfT8o X-Received: by 2002:ac8:1402:0:b0:3a7:ffe6:dc60 with SMTP id k2-20020ac81402000000b003a7ffe6dc60mr6981778qtj.42.1674028613981; Tue, 17 Jan 2023 23:56:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674028613; cv=none; d=google.com; s=arc-20160816; b=yaMVZBYVXwItsK1zDze0yB0d2H/zVkwuEzML/I0oh5ffF6FT07oOO5spwHzEG1vD1A zvofIGq4NGyl88BaSLY4ops0gfmGabUd2J5ceFv7adgr10lBkfSTRoxRg6V36eNJ2pig fuwSagVlvrpLuCxXVA8MH8V82ICPeiyryVMthUr+Xmoscu9w+OpWQ5iAV1oZ+9/LE6sf F5HhddWuRxn0VSQiXEYo32ePMsPTq/pk2vRbETPF0LcbNXwef6hJgkVSQz2RfdXND7Qc HD0pv6oNN4C0LHXA+9iOayvb0G+jxGmHAccpSda67rc36SQHmViEu8of273d4OTDK7J8 SMuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:ui-outboundreport :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=yjWBptjVBuY3nPuikgqSjn5Z6tzNnn2q6rZr50rupcc=; b=aqYlqkBdGZH5IxmX/i2WOS74uQ/Nz719QBDlasXw9CSEq0Xj8DD30In7kSwFCYHOLC gSXfvbe+kwfeRdG+ctVSh9mLbEHJDwpEnnbxslVtBgwutI/kVDWVi+S8K0Lv7pm2JmX3 pWXpgHF8p1zqvnZLu3fSSfhMfNiUH9lY3ZNDX/wYP0LWR8/wewZJbRGNri/ggJsHmqrb PdrmAP2qAHDkxenkiMOdstmjTVBVI0BC1oWqER4kj8BptASzPkfcasBS3bgJf/R8bE09 U6D1FNp/4NxC6W0swDc0PZxK7N455fRFo99UFl/R3BgCSeGE6dJnyYLaxplzoHFfeb5R 1cUg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bw13-20020a05622a098d00b003b64639dea8si1566252qtb.650.2023.01.17.23.56.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jan 2023 23:56:53 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pI3Fa-0001vf-8K; Wed, 18 Jan 2023 02:52:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI3FY-0001tH-Bs; Wed, 18 Jan 2023 02:52:48 -0500 Received: from mout.kundenserver.de ([217.72.192.73]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI3FV-000230-VU; Wed, 18 Jan 2023 02:52:48 -0500 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MORIm-1p5UiC2avG-00PutN; Wed, 18 Jan 2023 08:52:42 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bernhard Beschow , Laurent Vivier Subject: [PULL 10/15] hw/i386/pc: Remove unused 'owner' argument from pc_pci_as_mapping_init Date: Wed, 18 Jan 2023 08:52:29 +0100 Message-Id: <20230118075234.2322131-11-laurent@vivier.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230118075234.2322131-1-laurent@vivier.eu> References: <20230118075234.2322131-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:F0YiJPenFfWcYGA+MM30ktuEF6rYVafptZDUXIh6L4vyVxHLpKx 7Ps4RVPIh1u4hlVV+duIGOd02Qw2FwP8uDHB+SXG9yxJ+ExFKs9WJ1/wnpa/R1cPbfaFhJD +aQn/9KjfzHxM1FzCX6xE03QEEW1EQtDyYWlgygZFTst0Y/GE7eKCYKE4v2BDQwWH1ctIkB 3p5n+93pKvVkgGVQDQbMA== UI-OutboundReport: notjunk:1;M01:P0:MBaRvVOEQEw=;lvSSvDIVhQWROAr54DTrr0ttxE9 YRndgDTmKe6iHedgegVvsgVemhab9w7V0WViUGI4Qt5FwtBd6vp0DEediXUYxaYZrHwJVKC9j D1q5QPAhxUPd1SC8bDubhoV0jmctJKokxv4eT6xi81XZp2CMWknQq29h0ZF625vk225UYNT0o CcXMxSircQKc7HU2DfVWZ2LXgGdYmXpPpjC8vwYbaeLmQrnC0teqE93D/xr2O7GtJlLW6y/hs pY6ClVPI7ImFZLyQEDNFfs5I28y5YDop7fmraO+agSi4mwhcT1zNt0dPo3rIZhtNpoJkX3N/e A6hk5o6WwtIgZkthXBokb12JavgiMt/N97WtacRd3s8DoPV52p0/u7PrmnnQ0Nz3/TFz5Iv+E Xqhzln0AyL5/4Cm05Xj8kBiWY1hZx7WaRflTZw+/RTqtyrpx0P9hhnVP5cIYIKjcUWd8AYp7M E0TJjEEck2aJTUN5monBBtOSbn8W7Iej3Hjlzb3w145t+BjmvE4FayhfegyY+fYS2R+D2oRN4 Htdhr0K6u1sgvgoyQQ5Ba8/R0PH3xisGSHSfI+2nyDy/5hWNQE6t/4aiuxKbWuv0ypQiCIu4F VnkslBlcEMIlCW+vxHP3oTLrdwZ3URN1AoqLzzBsOnYWZL7BJcJNbTh0rojxP6Ju+SxvguZCl g+RYN5lCpmvtHdSrmgZo8ivU9yuKTLc4lvjjEBsGEQ== Received-SPF: none client-ip=217.72.192.73; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé This argument was added 9 years ago in commit 83d08f2673 ("pc: map PCI address space as catchall region for not mapped addresses") and has never been used since, so remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Bernhard Beschow Message-Id: <20230105173826.56748-1-philmd@linaro.org> Signed-off-by: Laurent Vivier --- hw/i386/pc.c | 2 +- hw/pci-host/i440fx.c | 3 +-- hw/pci-host/q35.c | 3 +-- include/hw/i386/pc.h | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index d489ecc0d1cd..6e592bd969aa 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -782,7 +782,7 @@ void pc_guest_info_init(PCMachineState *pcms) } /* setup pci memory address space mapping into system address space */ -void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory, +void pc_pci_as_mapping_init(MemoryRegion *system_memory, MemoryRegion *pci_address_space) { /* Set to lower priority than RAM */ diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index d5426ef4a53c..262f82c30380 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -272,8 +272,7 @@ PCIBus *i440fx_init(const char *pci_type, IO_APIC_DEFAULT_ADDRESS - 1); /* setup pci memory mapping */ - pc_pci_as_mapping_init(OBJECT(f), f->system_memory, - f->pci_address_space); + pc_pci_as_mapping_init(f->system_memory, f->pci_address_space); /* if *disabled* show SMRAM to all CPUs */ memory_region_init_alias(&f->smram_region, OBJECT(d), "smram-region", diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 20da1213747c..26390863d605 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -574,8 +574,7 @@ static void mch_realize(PCIDevice *d, Error **errp) } /* setup pci memory mapping */ - pc_pci_as_mapping_init(OBJECT(mch), mch->system_memory, - mch->pci_address_space); + pc_pci_as_mapping_init(mch->system_memory, mch->pci_address_space); /* if *disabled* show SMRAM to all CPUs */ memory_region_init_alias(&mch->smram_region, OBJECT(mch), "smram-region", diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 991f905f5d25..88a120bc234b 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -156,7 +156,7 @@ void pc_guest_info_init(PCMachineState *pcms); #define PCI_HOST_ABOVE_4G_MEM_SIZE "above-4g-mem-size" -void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory, +void pc_pci_as_mapping_init(MemoryRegion *system_memory, MemoryRegion *pci_address_space); void xen_load_linux(PCMachineState *pcms);