From patchwork Wed Jan 18 07:52:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13105793 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 03FDCC32793 for ; Wed, 18 Jan 2023 07:54:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pI3Fj-00021U-FZ; Wed, 18 Jan 2023 02:53:00 -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 1pI3Fd-0001wz-5Z; Wed, 18 Jan 2023 02:52:53 -0500 Received: from mout.kundenserver.de ([217.72.192.74]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI3Fb-000265-CJ; Wed, 18 Jan 2023 02:52:52 -0500 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MAwTn-1pSkV221sX-00BKjO; Wed, 18 Jan 2023 08:52:37 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Guoyi Tu , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Subject: [PULL 01/15] Call qemu_socketpair() instead of socketpair() when possible Date: Wed, 18 Jan 2023 08:52:20 +0100 Message-Id: <20230118075234.2322131-2-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:gQP3ayBzPx9nHkCIa0cm7mnb4dTQyeyhSUSk/nOePNpd2zLxyy1 B0/Yp2OGAim5TK0Kiuv4/96eYnXayFSVb4cLJlkmsZLSF4GP1vbzT+QkXOF486aMgRBenWP Jzoiexkr7hOZjD/qTNxeyArh4CpaJQkr5naNr/RhGXb7nEemHnvmJh40vvbcT9Mz00Nv7nQ 8g/Srqt9YT2hK5EE2Y2bw== UI-OutboundReport: notjunk:1;M01:P0:YS1YaluTzGs=;a8tIbdAm4iVA+p5ZXeNI7A8PZ6Y U2TmNCO7p8YG8e9WRwLNE+4BsW+PNLlfAMiUgMDusqGwxouSCDUo1PZZeeRFfbtD+r28oWX+Y mwHm9PJf5EqrykibG4GBEmE4pbZ5XvHBRqSsCBrYb9LoEu1XZUAqGsmd3fxcKw2dW0DNGy+iV 75wtScKmmwR/JIQIepNay3ACPBr4SZvq+K18zgEAuhGrPI0FKpdmsr9FTgvzPgKDFLfkg0TlC mJ0fpQazU+eeVi3FgCVOLmTMr757QVp/ltp8z9NDd/jO7jkbUhOF7Unh55J/UvA+w4uJtVcxl I3vAIcuDnInInnSaV/0i9Sp7qvdaPd2yJsosN9cTJLkSBPq/dagH6MUTwJ5+l5VMANuZZrg+H DWZvBGUDogTc9vzjuAVWIYvMVcBrdXDGOkeeBFOf6yo1uNA+63oF+4ug9bDccyEO/oeXx9jUJ av4DTPBPTyX652Q8sJYjBNSUOjqE5ceD1GnZrXnVVf/C1pXaj4L4s0zGL5EP0uYCEpdiUQSoi 8z/yFe+N/ygMO37g23i1UiAvh4yJg/p7t/enAFVet+PwYOpG2erNOwebVAITaQvA085boI0nP 5pfL+wUftUn1JoZuvOg928wJges5ZGrlSgtMZtXnHzJWGlznWQStXcfoWO/bAKsTvxipBPBkv MzWgDnp8RJfFWrmMvxEpeSh/eF+CUzS6HK9e49h0mw== Received-SPF: none client-ip=217.72.192.74; 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Guoyi Tu As qemu_socketpair() was introduced in commit 3c63b4e9 ("oslib-posix: Introduce qemu_socketpair()"), it's time to replace the other existing socketpair() calls with qemu_socketpair() if possible Signed-off-by: Guoyi Tu Acked-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: Signed-off-by: Laurent Vivier --- backends/tpm/tpm_emulator.c | 2 +- tests/qtest/dbus-display-test.c | 5 +++-- tests/qtest/migration-test.c | 2 +- tests/unit/test-crypto-tlssession.c | 4 ++-- tests/unit/test-io-channel-tls.c | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c index 49cc3d749dc4..67e7b212e3eb 100644 --- a/backends/tpm/tpm_emulator.c +++ b/backends/tpm/tpm_emulator.c @@ -553,7 +553,7 @@ static int tpm_emulator_prepare_data_fd(TPMEmulator *tpm_emu) Error *err = NULL; int fds[2] = { -1, -1 }; - if (socketpair(AF_UNIX, SOCK_STREAM, 0, fds) < 0) { + if (qemu_socketpair(AF_UNIX, SOCK_STREAM, 0, fds) < 0) { error_report("tpm-emulator: Failed to create socketpair"); return -1; } diff --git a/tests/qtest/dbus-display-test.c b/tests/qtest/dbus-display-test.c index cb1b62d1d11a..fef025ac6f83 100644 --- a/tests/qtest/dbus-display-test.c +++ b/tests/qtest/dbus-display-test.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" #include "qemu/dbus.h" +#include "qemu/sockets.h" #include #include #include "libqtest.h" @@ -36,7 +37,7 @@ test_setup(QTestState **qts, GDBusConnection **conn) *qts = qtest_init("-display dbus,p2p=yes -name dbus-test"); - g_assert_cmpint(socketpair(AF_UNIX, SOCK_STREAM, 0, pair), ==, 0); + g_assert_cmpint(qemu_socketpair(AF_UNIX, SOCK_STREAM, 0, pair), ==, 0); qtest_qmp_add_client(*qts, "@dbus-display", pair[1]); @@ -152,7 +153,7 @@ test_dbus_display_console(void) test_setup(&qts, &conn); - g_assert_cmpint(socketpair(AF_UNIX, SOCK_STREAM, 0, pair), ==, 0); + g_assert_cmpint(qemu_socketpair(AF_UNIX, SOCK_STREAM, 0, pair), ==, 0); fd_list = g_unix_fd_list_new(); idx = g_unix_fd_list_append(fd_list, pair[1], NULL); diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index dbde726adf8c..1dd32c9506bf 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1661,7 +1661,7 @@ static void *test_migrate_fd_start_hook(QTestState *from, int pair[2]; /* Create two connected sockets for migration */ - ret = socketpair(PF_LOCAL, SOCK_STREAM, 0, pair); + ret = qemu_socketpair(PF_LOCAL, SOCK_STREAM, 0, pair); g_assert_cmpint(ret, ==, 0); /* Send the 1st socket to the target */ diff --git a/tests/unit/test-crypto-tlssession.c b/tests/unit/test-crypto-tlssession.c index 615a1344b4aa..b12e7b687927 100644 --- a/tests/unit/test-crypto-tlssession.c +++ b/tests/unit/test-crypto-tlssession.c @@ -82,7 +82,7 @@ static void test_crypto_tls_session_psk(void) int ret; /* We'll use this for our fake client-server connection */ - ret = socketpair(AF_UNIX, SOCK_STREAM, 0, channel); + ret = qemu_socketpair(AF_UNIX, SOCK_STREAM, 0, channel); g_assert(ret == 0); /* @@ -236,7 +236,7 @@ static void test_crypto_tls_session_x509(const void *opaque) int ret; /* We'll use this for our fake client-server connection */ - ret = socketpair(AF_UNIX, SOCK_STREAM, 0, channel); + ret = qemu_socketpair(AF_UNIX, SOCK_STREAM, 0, channel); g_assert(ret == 0); /* diff --git a/tests/unit/test-io-channel-tls.c b/tests/unit/test-io-channel-tls.c index cc39247556f3..e036ac5df4c2 100644 --- a/tests/unit/test-io-channel-tls.c +++ b/tests/unit/test-io-channel-tls.c @@ -121,7 +121,7 @@ static void test_io_channel_tls(const void *opaque) GMainContext *mainloop; /* We'll use this for our fake client-server connection */ - g_assert(socketpair(AF_UNIX, SOCK_STREAM, 0, channel) == 0); + g_assert(qemu_socketpair(AF_UNIX, SOCK_STREAM, 0, channel) == 0); #define CLIENT_CERT_DIR "tests/test-io-channel-tls-client/" #define SERVER_CERT_DIR "tests/test-io-channel-tls-server/" 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: 13105785 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 538F3C004D4 for ; Wed, 18 Jan 2023 07:53:16 +0000 (UTC) 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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: 13105795 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D09F7C32793 for ; Wed, 18 Jan 2023 07:55:21 +0000 (UTC) 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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: 13105800 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 1C95CC7112F for ; Wed, 18 Jan 2023 07:56:52 +0000 (UTC) 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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: 13105797 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 7A196C004D4 for ; Wed, 18 Jan 2023 07:55:32 +0000 (UTC) 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13105789 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id CF1CAC32793 for ; Wed, 18 Jan 2023 07:54:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pI3FY-0001sQ-1X; Wed, 18 Jan 2023 02:52:48 -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 1pI3FW-0001r0-16; Wed, 18 Jan 2023 02:52:46 -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 1pI3FU-00022X-Ek; 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 1MUooJ-1p90gr1ndp-00QoFa; Wed, 18 Jan 2023 08:52:40 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Thomas Huth , Richard Henderson , Laurent Vivier Subject: [PULL 06/15] hw/cpu: Mark arm11 and realview mpcore as target-independent code Date: Wed, 18 Jan 2023 08:52:25 +0100 Message-Id: <20230118075234.2322131-7-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:t6NiMFPRVAM3GS9YH1X/Ayw2z21UADbEHyddBcaeVDVHVhdl7vc U066daolYxZ+Co57tmMuZxWukyxjBjJqBM4AW7MyBXEmnBJV7k+jloSVaPYPiIT5d9PwiMR GOVAkaOzH0ZmpS9FRtsqOPkUAhQ3Z57SQj7g5W3aBtgXOFtFbt7Bc4EuqJlETTZpA6yU56y pKorlRY7Rivsm20fngkVA== UI-OutboundReport: notjunk:1;M01:P0:UqziQDf/oI4=;eqgjyGcGAQL7rR7+erqu7+Z0W9Z RNcV4qa3y6laVqPl78cHxFk7JxM1QmP7o6Z3aRLj2QxLhqsKtTu7cOTOCc3D769zpuE9vRg8o BEVuTxxyjFodB6KpcyOrDQA00LNysd9eGrZOsWL5JJOS9LaC94gHEEDy/38hM1rZ2+lLuZou7 GK4U9azEZgNWhQrXeby/E1GEkb1zRX2TLxDiVCUWBEwBl+t5cPWoQNr/qYQUV8c5NYANqb4uc Gm8y2nd5bVKV9+0mNaQu9kvSQYnag1h4XDYMzZxN++Uqyv6DwDe8AMhDQ2QRrNorxxdCi7MGf fUMnmQIJDc9Wmup8NMycVQEB2KoHRKFgcK9iOkVM6Al90EcPoFzIqV76zbzkDMMDltXY3GE0o pM325f5s1ceeiyiDNNglkcZGAaA7MERzktSVYehdtcgV4Hk4Teo7wuugaOCKndpGxHSmMN6/1 OY5HAxAuLfjOZdf5Tvg6NbAC1keJaucLW6nAT2C5G7NRQiifgCcXXl7qb3Bzvwl507ImOtdOo 5BTtBVVBniIg09DNlDIqocI2Zc5o5aQLmcWxNGeGqBRTzWVFaUw6hGOZdwYAOg5eHiH4AXh00 KpY3o84nz1lp0CIfTn3JqcRUVn/6zj1yGsqkRWPaQrhk744LGihT79fqwdTuQBq1fJQI0CJD2 M5Q/QYI66ycyDHl4sdfj2Y4X1nHiV/ob92NKHRR+3w== 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Thomas Huth Seems like there is nothing target-specific in here, so these files can be moved to softmmu_ss to avoid that they get compiled twice (once for qemu-system-arm and once for qemu-system-aarch64). Signed-off-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20230112134928.1026006-6-thuth@redhat.com> Signed-off-by: Laurent Vivier --- hw/cpu/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/cpu/meson.build b/hw/cpu/meson.build index 9e52fee9e778..e37490074f5e 100644 --- a/hw/cpu/meson.build +++ b/hw/cpu/meson.build @@ -1,6 +1,6 @@ softmmu_ss.add(files('core.c', 'cluster.c')) -specific_ss.add(when: 'CONFIG_ARM11MPCORE', if_true: files('arm11mpcore.c')) -specific_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_mpcore.c')) +softmmu_ss.add(when: 'CONFIG_ARM11MPCORE', if_true: files('arm11mpcore.c')) +softmmu_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_mpcore.c')) specific_ss.add(when: 'CONFIG_A9MPCORE', if_true: files('a9mpcore.c')) specific_ss.add(when: 'CONFIG_A15MPCORE', if_true: files('a15mpcore.c')) From patchwork Wed Jan 18 07:52:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13105792 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id CE46CC004D4 for ; Wed, 18 Jan 2023 07:54:51 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pI3Fc-0001wl-DH; Wed, 18 Jan 2023 02:52:52 -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-0001rm-Hg; Wed, 18 Jan 2023 02:52:47 -0500 Received: from mout.kundenserver.de ([217.72.192.74]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI3FV-00022l-LC; 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 1MybCV-1oWQoH47OH-00yynK; Wed, 18 Jan 2023 08:52:41 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Thomas Huth , Richard Henderson , Laurent Vivier Subject: [PULL 07/15] hw/intc: Mark more interrupt-controller files as target independent Date: Wed, 18 Jan 2023 08:52:26 +0100 Message-Id: <20230118075234.2322131-8-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:1dBPmoAzHJTZs82nfWcfQm1PIe/ZhDN9XSSHaaUMSDcWqlJ1wcT /nL2mZUkEoJQdOoFeowq7ha+8+zRPPSH4/aJu7EmW9XxjAOHNlKODHPlBrUrIOMfU9vImi9 B/+X3EkKhGinBeQHAcBX27RSS17f//RabAUaTMZuwDKi18RYgAIFaCWn5AUcTYVAa+B972g Xy0JYmzvW9hauIVx4rdSg== UI-OutboundReport: notjunk:1;M01:P0:c4NQCdvE6Ps=;a3NTXS5Plo5j3CCNY9s4DFPnPHT 4WAOjaJimThnnENvIhdLnIuldbHFOE6GFwR0gZq/h8zDWTfjj0qneNo7NM+7ZwNtX98S8V0J/ qEJJW0874/sQeb6Xzk+1mqslhlhs2PJXqou0VYY19SfNachfthzArZtWkya6saE2d6Q6R4SEs BNbCbu7Ko0PnAErrAaD1qgF1rc8tDeikI72bGDaLjz6mvluTeRGvfiwYRXGzMwMcKv66pZQWp IBuL2a8lfAVMVXekzXoDClqvoel0LWOBIdY2JHq1p9p9jXmen9rcAgjuP4YoniGd5zx/GUaf5 gxSWG7zsQa1f0oec/OjTFf0uFsKFsHYHXC2I1VU2wL7GcDyiPAFLPJRiNaMttmnuC+hLWTUde 2h1wOe8s1XppotWAme5Fsnxl/v4Nc4TdK+lNaDGyfPU0tZyxtmG5OCRxX/BVqdoA5fXnDqoQY kgDhNOTeIEMGRxu6lu1MqKrQYLWrckm2AFZGkHjQu1VGx6zz3yFIiPVlJFx+CVP6cJ9nrMND1 cpt1SQyU8pRLm9iUf4DHd04LFShRh6a6pybBVHNFO7VvreaXEDLmZicq1QF4pHYm04gQFltp8 yGY1rlTXBqjxO76KGJemhxXvGi3VEJuwMtroBEyg4dyq7EPHoaioBhGDOaM76fjRzgvTp9Qen qETxnFM0I9XlBO1lqsaro+KOec5GB77LLNBMzgyzCQ== Received-SPF: none client-ip=217.72.192.74; 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Thomas Huth Seems like there is also nothing target-specific in here, so these files can be moved to softmmu_ss to avoid that they get compiled twice (once for qemu-system-arm and once for qemu-system-aarch64). Signed-off-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20230112134928.1026006-7-thuth@redhat.com> Signed-off-by: Laurent Vivier --- hw/intc/meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/intc/meson.build b/hw/intc/meson.build index 0988cae8ab06..8be459b41c6e 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -12,6 +12,8 @@ softmmu_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files( 'arm_gicv3_its.c', 'arm_gicv3_redist.c', )) +softmmu_ss.add(when: 'CONFIG_ALLWINNER_A10_PIC', if_true: files('allwinner-a10-pic.c')) +softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_vic.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')) @@ -19,8 +21,10 @@ 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')) softmmu_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic_common.c')) +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_intc.c')) softmmu_ss.add(when: 'CONFIG_OPENPIC', if_true: files('openpic.c')) softmmu_ss.add(when: 'CONFIG_PL190', if_true: files('pl190.c')) +softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_ic.c', 'bcm2836_control.c')) softmmu_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_gic.c')) softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_intctl.c')) softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_intc.c')) @@ -33,25 +37,21 @@ if config_all_devices.has_key('CONFIG_APIC') or \ softmmu_ss.add(files('kvm_irqcount.c')) endif -specific_ss.add(when: 'CONFIG_ALLWINNER_A10_PIC', if_true: files('allwinner-a10-pic.c')) specific_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c', 'apic_common.c')) specific_ss.add(when: 'CONFIG_ARM_GIC', if_true: files('arm_gicv3_cpuif_common.c')) specific_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files('arm_gicv3_cpuif.c')) 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_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')) specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gic.c')) -specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_intc.c')) specific_ss.add(when: 'CONFIG_OMPIC', if_true: files('ompic.c')) specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_OPENPIC'], if_true: files('openpic_kvm.c')) specific_ss.add(when: 'CONFIG_POWERNV', if_true: files('xics_pnv.c', 'pnv_xive.c', 'pnv_xive2.c')) specific_ss.add(when: 'CONFIG_PPC_UIC', if_true: files('ppc-uic.c')) -specific_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_ic.c', 'bcm2836_control.c')) specific_ss.add(when: 'CONFIG_RX_ICU', if_true: files('rx_icu.c')) specific_ss.add(when: 'CONFIG_S390_FLIC', if_true: files('s390_flic.c')) specific_ss.add(when: 'CONFIG_S390_FLIC_KVM', if_true: files('s390_flic_kvm.c')) From patchwork Wed Jan 18 07:52:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13105796 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 67C1EC32793 for ; Wed, 18 Jan 2023 07:55:30 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pI3Fa-0001vu-E0; 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 1pI3FX-0001rZ-5V; Wed, 18 Jan 2023 02:52:47 -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 1pI3FV-00022y-In; Wed, 18 Jan 2023 02:52:46 -0500 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MfHMj-1ooWBu29hT-00glSG; Wed, 18 Jan 2023 08:52:41 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Thomas Huth , Richard Henderson , Laurent Vivier Subject: [PULL 08/15] hw/usb: Mark the XLNX_VERSAL-related files as target-independent Date: Wed, 18 Jan 2023 08:52:27 +0100 Message-Id: <20230118075234.2322131-9-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:hvs3qR2uYkI3sVXjP6KBaYwM5OfkinMVZldKEPaMTDRAkLmzOjy nBEN99LqTs0Jh24nIGkZWzOrpOyv7ZOG6cWHYygFCFyQ2GBRiwvoElqKZ/D6wO0Ke0cV2UE NWN7N6z4ujNmoNJqjHaPk3BI22HRnoEwQq5y8H+NxrgunfTotqs7SGaZKVglA/hysvZRmWw agpc1A8HM6hVb9ZlNJCBw== UI-OutboundReport: notjunk:1;M01:P0:ENuNSenOShQ=;qWt7dnVd84Y515OQDkw7sdtLAqS n7cuJwjfZNmATKlAPGLA8Fit0eyQkWksMwyex9ntlmXJGmMVEwOkOWHAy/3lusKCahrSqfGnO iqigdwM/3FWqoHx5r0Ac6tcx3tXZ0pBMPiELEz1lT8ulBZbRQO5joXDm8njrYACDxxG9wdfbH DRAzBFw2K2UAC3yzhOJeke8uRE2sktwU7tZKrIr657R1LXvS75ri4n80ubXbzhqaDfV5lFpV+ sfTniYIXBYl/C8TdRPz72M3TEYj13SGPAktjmyBgW4+UuboE+YUYEDfTQSOiw6ixVE7ViY/7i ccsdwI2Q3Lt+wfawHkhcqxo6aLwBD23QdtFpOecno0IElEMW2sSaagrD1opCfiJBcNmuI0EPd 3MVzMfJ6VGa/GOBcdahtFvM0PtmcyWWrlqGVgdHqZo9a5bVIUBHBCQ3GXK36/OpNYSjB6iZ8L mmcsX+2CuIG5sgvGJ3pAwi7kkztHv5axvmd/3uuQ+1N6v7dsgyJ+mTKceZ4+csROEqozAptfc BeYHJxQ6DopB7y4oeGgBilKCMBifgjiKnmo1TBqE8lxgkF+VbhPI79PVbLzlc3EfFPijWPomY 1Qq7BaoTrD+6bQ34LIxfXU42uyKzpho46U16GR9FGSTC2HXlzz+kqv5o6XIBhucZak49ew/fi foBbE6hdYIyDaV4wEs4lrfB3GgEuyylNHk4NrOb7kA== 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Thomas Huth Seems like there is nothing target-specific in here, so these files can be moved to softmmu_ss to avoid that they get compiled twice (once for qemu-system-arm and once for qemu-system-aarch64). Signed-off-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20230112134928.1026006-8-thuth@redhat.com> Signed-off-by: Laurent Vivier --- hw/usb/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/usb/meson.build b/hw/usb/meson.build index 793df42e2127..bdf34cbd3e30 100644 --- a/hw/usb/meson.build +++ b/hw/usb/meson.build @@ -30,8 +30,8 @@ softmmu_ss.add(when: 'CONFIG_TUSB6010', if_true: files('tusb6010.c')) softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('chipidea.c')) softmmu_ss.add(when: 'CONFIG_IMX_USBPHY', if_true: files('imx-usb-phy.c')) softmmu_ss.add(when: 'CONFIG_VT82C686', if_true: files('vt82c686-uhci-pci.c')) -specific_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-usb2-ctrl-regs.c')) -specific_ss.add(when: 'CONFIG_XLNX_USB_SUBSYS', if_true: files('xlnx-usb-subsystem.c')) +softmmu_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal-usb2-ctrl-regs.c')) +softmmu_ss.add(when: 'CONFIG_XLNX_USB_SUBSYS', if_true: files('xlnx-usb-subsystem.c')) # emulated usb devices softmmu_ss.add(when: 'CONFIG_USB', if_true: files('dev-hub.c')) From patchwork Wed Jan 18 07:52:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13105790 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 980E6C6379F for ; Wed, 18 Jan 2023 07:54:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pI3Fd-0001wx-13; Wed, 18 Jan 2023 02:52:53 -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-0001tc-I3; Wed, 18 Jan 2023 02:52:48 -0500 Received: from mout.kundenserver.de ([217.72.192.74]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI3FW-00023S-R9; 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 1N8GEY-1oeMuI0HNQ-014FbD; Wed, 18 Jan 2023 08:52:42 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Thomas Huth , =?utf-8?q?Phili?= =?utf-8?q?ppe_Mathieu-Daud=C3=A9?= , Laurent Vivier Subject: [PULL 09/15] tests/qtest/test-hmp: Improve the check for verbose mode Date: Wed, 18 Jan 2023 08:52:28 +0100 Message-Id: <20230118075234.2322131-10-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:Dx61oh7UgoUb6ccRlsFjo+8qD+sQBRWEano7rEUjZ0hzarsoSyY r4lr/osnrA57TnLqfCrSQJTgZqp2+TAzTLcyO4b2zHrjMSaEuUDTPXG2fjAnOVrKUfOSA90 vPg/1FMsWxihwY7u21DwM/iYSKBSaG2Jk/5LbHHlfzZRirgDOWYuS8HPe7o5gETlcD4TDxH HVK11ET4i4xp7NTqa0zjw== UI-OutboundReport: notjunk:1;M01:P0:yYHCjb62Gfk=;Dcg3ZD8YJjugpy5HPkiFbpeDGk9 5lxPns9v/Eg6y19at1XCxJkn57uK85Q/2HQOPymHEBX3h1rSUwyAZN/pd6CwZMhpiHQB1yjl3 1HjUC7qKtDCnlWaFaTb/S20snuVnd1OcVp8p9TwPsa6nvB574cRl32CTzZEPiYxRyP7oav9dW ScT9Hl7DK1/jilQw+3KAn8DauBuHAItBlRkcd/efA4Oi3RKzHk0qsR15tWEGu8QRsALN6tnEN uv8xmk9Bw+B+J320SgQ/AuR03+3OEDDv42xU08TWV2OtOP3dQ+WLeR+FZvztYm3cla/9gCZwa GvIbW31O/ksUmcuFGHInwvzLQvZCU68FynJliWtF6J5tGGzTpJMMs+hDQsKCH0hQHVu7TqT+f Sqa2D0qb/zM7ANc2UsY2cFuYgKniBv+1n/D0vOFknrEnJm70rNc8WY0EVPhzlrS73CbQwKZtF Hp22KkgLJpCp/Wu85nhaUbT4865v8vlRegkMfNCgDCXHoLr0cKu7OpPGYuNE4oWzuQtnlhSuZ NzI/9jzPHQ/e+yYVXtbQtdBe48WaG2LQPDCUPFgzZ47Ksaj5RZlQHMKh9m9P1lJcR7ykaP6wM F6Hvv7ClUmDyKixn3uyBHN0j/7/erJ6Wbci4wTAqIpXLEBxyZPuHFFsceFfrqeH6/tF+kuhtG UUEdy5xFUSL1YLRugropEEi149KvKSdHRFNe1GOb2A== Received-SPF: none client-ip=217.72.192.74; 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Thomas Huth Running the test-hmp with V=2 up to V=9 runs the test in verbose mode, but running for example with V=10 falls back to non-verbose mode ... Improve this oddity by properly treating the argument as a number. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230109101306.271444-1-thuth@redhat.com> Signed-off-by: Laurent Vivier --- tests/qtest/test-hmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/test-hmp.c b/tests/qtest/test-hmp.c index f8b22abe4cac..b4a920df8983 100644 --- a/tests/qtest/test-hmp.c +++ b/tests/qtest/test-hmp.c @@ -151,7 +151,7 @@ int main(int argc, char **argv) { char *v_env = getenv("V"); - if (v_env && *v_env >= '2') { + if (v_env && atoi(v_env) >= 2) { verbose = true; } 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: 13105801 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 81606C38159 for ; Wed, 18 Jan 2023 07:56:54 +0000 (UTC) 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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); From patchwork Wed Jan 18 07:52:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13105794 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 5F3ADC38159 for ; Wed, 18 Jan 2023 07:54:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pI3Fb-0001wE-G4; 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 1pI3FY-0001tu-Pc; 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 1pI3FX-00023w-4d; 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 1MVNJ3-1p7MGS0eBT-00SS8u; Wed, 18 Jan 2023 08:52:43 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Thomas Huth , Laurent Vivier Subject: [PULL 11/15] ccid-card-emulated: fix cast warning/error Date: Wed, 18 Jan 2023 08:52:30 +0100 Message-Id: <20230118075234.2322131-12-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:J7tTA/l8mOTAgK9vXFIO7KZ3YwptmGer1KuWDAKCqAjMsxI4bmt Qs++Gu4J3rLU2sOsouklo473EM7XUtM07jNTfjr18wKuOE57SYoFzB9omRyAy+kP96GEYPY aqzNn/olt+x0I2aY0qQtkudQRQCN3NnR/tgn9KOFsgQSnkThrWp+yxYoAajc5cc8p6Vq3ZC GrNS6vJseUaYWlXbSP7TA== UI-OutboundReport: notjunk:1;M01:P0:qeBzdlQ8CSU=;+58mGJxI1VuQ7LS5rEUy4AW9wXc DmItn5V74b8naTZAvSy/y9qa1DLkqC2qx05bAOn6w6D9Kg+s75I28BfouROhkTXkwPGmQ6foZ XBjy2tEdMeXtl8Mz6A+9qFISx4mTUX1VC0YSjdTTwU7KYGJHw/kC6chq+PO9BuBxIBUk8OiOb k5BzgY/G4ZfFYRdsqea3rsho1HD1F2sGO18jdf6ixrD/yUuVkzA7MqnjXaaRv92yXsc/OZHv+ MpVcHqEecoq1MKbTpKZ+P2fRcRxHsPvapGxaL8SV3PEQcSNLo2wmhcV7v4sxzjkEkvChmYupO WgMCI1n2QPckXmWkJeqzfKxiLLEmsp4kk/2HRvvv17vN8HES4Hjb2ydgNhnTKPtQA5cFS1Aw7 YJ7DgQucvglVOUaOJ+PR3+OG59HEKy0UmcxE+oikcF6DIpA7B+8ZvesahzBbvEb6GsggWuCBd 9H/eWridGd5BhUpWPX0fvBO88qbYmHj5BAncMKuBK/g+a7wda9gRb3afhG/MZs5l96pJrSd+F KGXQLdgDyIyaOl3QJGlhpqRpry81eSK4/Gk31Hhhcyl+YGgHbHqQYoc7P8W5mZnsB20Dq2b/M pdWPRz/Z1oBTxj114K6XpMIZxVZD7J0bolCPEgNYSRjApZzufm9LLpcvcj1E3RYlc6gSFjtJB r2VeanSXp+IV2WPdunysYv/xDzu5bxWCsGivow5pmA== 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, TVD_SPACE_RATIO=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Marc-André Lureau ../hw/usb/ccid-card-emulated.c: In function 'handle_apdu_thread': ../hw/usb/ccid-card-emulated.c:251:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] 251 | assert((unsigned long)event > 1000); Signed-off-by: Marc-André Lureau Reviewed-by: Thomas Huth Message-Id: <20230103110814.3726795-2-marcandre.lureau@redhat.com> Signed-off-by: Laurent Vivier --- hw/usb/ccid-card-emulated.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index ee41a818014b..c32866007549 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -248,7 +248,7 @@ static void *handle_apdu_thread(void* arg) WITH_QEMU_LOCK_GUARD(&card->vreader_mutex) { while (!QSIMPLEQ_EMPTY(&card->guest_apdu_list)) { event = QSIMPLEQ_FIRST(&card->guest_apdu_list); - assert((unsigned long)event > 1000); + assert(event != NULL); QSIMPLEQ_REMOVE_HEAD(&card->guest_apdu_list, entry); if (event->p.data.type != EMUL_GUEST_APDU) { DPRINTF(card, 1, "unexpected message in handle_apdu_thread\n"); From patchwork Wed Jan 18 07:52:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13105799 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 9327EC32793 for ; Wed, 18 Jan 2023 07:56:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pI3Fa-0001w9-Rc; 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-0001tg-Mq; Wed, 18 Jan 2023 02:52:48 -0500 Received: from mout.kundenserver.de ([217.72.192.74]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI3FW-00023L-RF; 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 1M42b8-1pI3FT2uLQ-00023T; Wed, 18 Jan 2023 08:52:43 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Yuval Shaia , Raven , Laurent Vivier Subject: [PULL 12/15] hw/pvrdma: Protect against buggy or malicious guest driver Date: Wed, 18 Jan 2023 08:52:31 +0100 Message-Id: <20230118075234.2322131-13-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:6aHjtHLv6iSXuw3k9XqVyX+UA/RTpSksAfSYQncQCpPeVqLXWzy Dox1yjqKNQWqeqkTRrWO9j89y4MnR2sjbh+0k3XxqqzUmSbZEE7Bv/bbo2XD+nhtk+czHVW WL1GJq/55sNt9EuRL3LFFT1U2u+Oxp9Ryi0MPjF3hl7elZmykmSZYukXWkXVMSf3uirKSkL u/RzeP6O8Q87rTaA/JWRg== UI-OutboundReport: notjunk:1;M01:P0:sviUA3l5rsk=;ul11+I4s4nAobkRdbAjs/rcDOR2 MVc0dwl+sE1QkCTbgGoyyu+XgENObH7iXPeEbDz8pxUKNYvpnWX75p7zSIKhkszRhSVeuD6LG Mud39EhKbMC9biLAd5JHflGLIBm4hazoAtL2JJ0IMqtVmgC0GgLjf4A2mY+e+Bz5PeTx8EMo9 edilMudVNLBap2+QJP2x6kyLK41N0WUuoJ2+ZtySWEM3DobNHkxTZmohPV4JYpwGKsUTd6ZPR SpkjZPG8ChyCnCa4Yn1zs/Z5RiGuSXIBiuXXOSJaxCZ/RJoHaH5mxiNmaqxuEewTXxf3rI5VW 9MKMWKKd82xuy+7E8vsGkG4ftm8Lv20134UdIomcjTXMn9g10lMQ2lCJTpTAWcLkgO+haUXOi i5ims4UQq1PB6ilHHP0Bp3yOKluV+8UexUcBHXuMqBDdJtKTaRK5GvdvJ/OlWzRSTq1lZReoC SduCsFQz0XAhqWA0B5zPDfe/Hwh/2YqWK4t2J0caWcMozjd5sNr3edpt+nZw9t2BrGgXMRbsW MBYwugxIR26G5VytxHrDPeyGAybbJkOF6NktxMuj5Dl4+UykhoJr5sIQRVnvT/Ttx+zerLrC2 wNVn5Q7ulQnog/U9crKWCRFpd7KxemqlKqTeOI1KGdGt8iWs7EoFnMAz0teN5I/fXmeR8xQMZ DPGnS0j5WBN/DBxl974KUK2+z/Dvqt0Lnh2hrXJs9Q== Received-SPF: none client-ip=217.72.192.74; 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Yuval Shaia Guest driver might execute HW commands when shared buffers are not yet allocated. This could happen on purpose (malicious guest) or because of some other guest/host address mapping error. We need to protect againts such case. Fixes: CVE-2022-1050 Reported-by: Raven Signed-off-by: Yuval Shaia Message-Id: <20220403095234.2210-1-yuval.shaia.ml@gmail.com> Signed-off-by: Laurent Vivier --- hw/rdma/vmw/pvrdma_cmd.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c index 1eca6328c924..c6ed02598211 100644 --- a/hw/rdma/vmw/pvrdma_cmd.c +++ b/hw/rdma/vmw/pvrdma_cmd.c @@ -776,6 +776,12 @@ int pvrdma_exec_cmd(PVRDMADev *dev) dsr_info = &dev->dsr_info; + if (!dsr_info->dsr) { + /* Buggy or malicious guest driver */ + rdma_error_report("Exec command without dsr, req or rsp buffers"); + goto out; + } + if (dsr_info->req->hdr.cmd >= sizeof(cmd_handlers) / sizeof(struct cmd_handler)) { rdma_error_report("Unsupported command"); From patchwork Wed Jan 18 07:52:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13105786 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 2AD0FC32793 for ; Wed, 18 Jan 2023 07:53:16 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pI3Fe-0001ym-RL; Wed, 18 Jan 2023 02:52:54 -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 1pI3FZ-0001ux-3r; Wed, 18 Jan 2023 02:52:49 -0500 Received: from mout.kundenserver.de ([217.72.192.74]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI3FX-000249-Em; 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 1MulyX-1oQMX941Br-00rrGG; Wed, 18 Jan 2023 08:52:45 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Michael Tokarev , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Subject: [PULL 13/15] hw/cxl/cxl-cdat.c: spelling: missmatch Date: Wed, 18 Jan 2023 08:52:32 +0100 Message-Id: <20230118075234.2322131-14-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:NQn6hB7qVWEBGdCpbIDPgmw6SUIGxdKd6bjYC8ApMCv0Z6tR1kH P/tMJNHDncrE3IVn8V1tdYh4mS3etHskp+kuf6HP1V4FcACyif7E0yfJ3SSGmsm6LC7bHoi 2+ac3MLUl6nIAjrjqj/uCjN58ON0vqy1QC7DuQY1GxUdWLd4b6q1fKUoka12+rLCnpAmpRP w8171sdMTYRNQ2OxVflrQ== UI-OutboundReport: notjunk:1;M01:P0:m0d6hqx0Rwo=;k8/nn/VNht+SDR0SkPUNyPIrQdD bCTN/pXhEOsJYYPPuxtuM2D/eM2XEPdXhlFcHr7cvaYIMAZmIxF3+InIgRl/URTsCYpnBZSUZ rKyuEVeduZ/MZ5h/zD8HKvyTtxf1Y3Dvi0GHO7jFEgEbUEk+UXZauQPHbEN92D0xim5D4gBxO e1tztomvkZ1s9R56BWzlk4EU4w7YFk/P5QxfbFWSwdYuy4P5akbar7wPTpfeRjuqn8ZPAi5+3 Ct15b6Mj+17nUeW5hJl2D6FkwwqIv4W7l8Hf6r3tciu1oLT7GklUsGgd+rtKuVRn9SDBVhgRV xdYnkXAj4BAKmVObihV9J4ATGk9s81IFYpNp2t2Ud2pdovz2tD9vgqVxywQQqfWzxasLqs5A2 1pKrsnJt1MVlVndBaRVbd7o1yRwLtFG2Jhbs47g9t9mw8rHIBdzWRPfJOafxNoYy7uXdUXuid /Zj7CO7Le3fBvVVGW3d/IaLSZF+g7SdEoIryDfWZLdjvV01J2yddv3gH5mDOPHxKt48+jzmk5 JIOzs2vfpupJZmF94uaKa3jWiTrqqoLKTMqLDitPPmV5MIJbESMnTsv01GInNv2Ual+ljuBE2 7n36rzgrpIfsUd2SxjuUC2QD+HI/4dBeUrM6St+mGzqWTv32mFMhQC5TcUx7zAcI3n81PA6MP g/J5Abg9WiwV/bg5jmI8ImdyQzU6B33sXbjVQYGJZg== Received-SPF: none client-ip=217.72.192.74; 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Michael Tokarev Introduced by: aba578bdace5303a441f8a37aad781b5cb06f38c Signed-off-by: Michael Tokarev Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221215123749.1026775-1-mjt@msgid.tls.msk.ru> Signed-off-by: Laurent Vivier --- hw/cxl/cxl-cdat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/cxl/cxl-cdat.c b/hw/cxl/cxl-cdat.c index 3653aa56f0d4..137abd0992cb 100644 --- a/hw/cxl/cxl-cdat.c +++ b/hw/cxl/cxl-cdat.c @@ -146,7 +146,7 @@ static void ct3_load_cdat(CDATObject *cdat, Error **errp) num_ent++; } if (i != file_size) { - error_setg(errp, "CDAT: File length missmatch"); + error_setg(errp, "CDAT: File length mismatch"); return; } From patchwork Wed Jan 18 07:52:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13105791 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 91D00C54EBE for ; Wed, 18 Jan 2023 07:54:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pI3Fg-00020H-8G; Wed, 18 Jan 2023 02:52:56 -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 1pI3Fc-0001wq-N6; Wed, 18 Jan 2023 02:52:52 -0500 Received: from mout.kundenserver.de ([212.227.17.24]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI3Fa-00025w-Un; Wed, 18 Jan 2023 02:52:52 -0500 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MGi2e-1pUgZw0o9y-00DnR7; Wed, 18 Jan 2023 08:52:46 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Hoa Nguyen , =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Subject: [PULL 14/15] hw/cxl/cxl-host: Fix an error message typo Date: Wed, 18 Jan 2023 08:52:33 +0100 Message-Id: <20230118075234.2322131-15-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:IVSXtRPLrRfzfkAQT7KBTH6AhgGJQI/mXG0VuobxxZe2T33bIKb UP4KMS+PGT0RVUzJJhR5EEeeA7ftu+4Hco9ftxWaUqCNAS/87Fw22I7SnWTQmrZ6sVVVUy/ f8tg4yyKqHg8FaOM1ipW3O1QRsW0WL5d8ivD5barm1qKfZW1fJITS2bC2O78q+5wn5yUkT2 N4hGaXld/0Omns3pmotlg== UI-OutboundReport: notjunk:1;M01:P0:u/k+P7hR8oQ=;Rc0doN7qHeu4hBP6Iiyn0GjPp+n h1C3/NX5ZJssNKAClxykQbBVtmFvB3GGsHpEx5T5u+z2XGiZvn0ADdVnt/rw1dlrLJpIV6uyj 3RkaColzJqmeCPbKsOawiV42uGX8nc1PE3/FKr2xycmmBBOgWfh+ngGbFQEfMcNkLiW/lEyvW d5cFOzV4Dw2bkesNpZewPoJujfXhu4mh3gXFjtMSa78P9jLud1oGSanWMagdsX2Ph6hMBzhak QgD4bg5I9gOWPJY7pN9P8uohgNY/8lYP0J1ayxjkrOZd5jwoDdfYPJlwjET5yXYVPQ5tnJ0xB deDo8XJUeiNN1PoLU47OEENbAsTzjTaDQNj2MxKiDkZg6QWzmkNPmJ9PXpclf1f1uco/qczc5 BjgPm2oJ3GQPektBuWeoMQJClc5qYln4LT9G89TwknurmLUpLwkZZ2peyDD4b7Y0UCPAQsu9K FL/OhpyQYd9HFs6nT522mMnLpZ4hOORvGVvMYSIvOs6jcaZ3TF/+021fHrUiV3ExektYwDNHx mzSVaLiYp02qVWVWh+0nKta1sN4qUI3WqUNCubLtWVoY4f2vlDeZsDnjo2GVUuoz4513WjaAX NieuXbYHLehiyREifjX2eVhEjsZ1n5Xitg/nPvV68Oo2tLvNt70Sdil7PMu36aev8YCP+/0Pz UNWffrNgIG7Yx5WDNRtHRF1Ncj+belSjaNqW19XuAw== Received-SPF: none client-ip=212.227.17.24; 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_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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Hoa Nguyen Signed-off-by: Hoa Nguyen Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221127032220.2649-1-hoanguyen@ucdavis.edu> Signed-off-by: Laurent Vivier --- hw/cxl/cxl-host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/cxl/cxl-host.c b/hw/cxl/cxl-host.c index 1adf61231ad5..3c1ec8732afd 100644 --- a/hw/cxl/cxl-host.c +++ b/hw/cxl/cxl-host.c @@ -47,7 +47,7 @@ static void cxl_fixed_memory_window_config(CXLState *cxl_state, if (object->size % (256 * MiB)) { error_setg(errp, - "Size of a CXL fixed memory window must my a multiple of 256MiB"); + "Size of a CXL fixed memory window must be a multiple of 256MiB"); return; } fw->size = object->size; From patchwork Wed Jan 18 07:52:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13105787 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 5D82BC54EBE for ; Wed, 18 Jan 2023 07:53:17 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pI3Fo-00023m-BA; Wed, 18 Jan 2023 02:53:04 -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 1pI3Fj-000217-5P; Wed, 18 Jan 2023 02:52:59 -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 1pI3Fh-00027b-AD; Wed, 18 Jan 2023 02:52:58 -0500 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mn2iP-1opYOe01NH-00k7WC; Wed, 18 Jan 2023 08:52:47 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Michael Tokarev , Alistair Francis , Palmer Dabbelt , Laurent Vivier Subject: [PULL 15/15] hw/ssi/sifive_spi.c: spelling: reigster Date: Wed, 18 Jan 2023 08:52:34 +0100 Message-Id: <20230118075234.2322131-16-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:8IOtGP+vbaAePoN+OxJvGgl45idpuCXX94Db5P6rqRcAyCnfeGA HQb46dKtNSq+JAIvI1i7vuUr6X3W+pUB638G0ZcTvtAwDPjFvHXHVcdQghkrZcDVNsaHCp8 /26XztZfxhcIAlSQ+rUBV0+x6KdzjiNbiK5QVwlbu9nYnUGdiEDS36XbvNurm/hi1aQRT8c j8gO0CxDWsOvktg47Y/ag== UI-OutboundReport: notjunk:1;M01:P0:A0qiVFCfwFg=;MVraoifNtVXaX/xqa4I3dia3XPv 37IBxJtiDYlkpacwMN7424GgnRPyEiIZodZQYncAhAn7Caro6HEEsAHPIZwO3BdkEF0zAyzfs +ZfKd9CO6uH1ppRoZYz7HfyQY/3gRHcxTfTlVE9QNYHKA0jOz6i69bEdYdmtFxlW7ZJjMTAyb 1wpmpqCy1hxWAMbyeLLYAUiBi+MSkPrIoVNKGX70GHMKCE/A921ssJfX3peXCS2t+K5CbstSy Ez6RAvR36Hjcva9Nd5ZpBTijgGvk/lgrH3NpcP7nU6Sjv+VmrrjAYGYXImQ8nclJGOIXVuYu3 xPMDi8YjrFli+GilPsyatmaIwSv3fhG1dUKhRVUKJme8GPUwZsCxzRcwP5s3jB4MDj2IsHo2N hoGk88pPgY+q1Psye4Cz+Vp7b2J1I5a2jYCiLsqCcrrApyKoOrqczWSxW+5RNG2tA+UfxYqIv /aKJlXD/5tu5+HnybEJbKRwl2Vw5+deQN1fLLi2cGWBVBat3Xy/S7/GljvgbM9mKe9jdWZ7sJ 85E34fga9DSZuKA4JCdkpWiDrZhFhunqgaOo0+N1jmLndXGerzQQr2SwK8sgAfTIe35yuDrN6 TrcUCKkh/miqFJ3MxTe2f0ptXMuHIUksvXrJ7+r0ImtpiY0romlONmNV3JwoNOeDvk9C+VcZ4 kAdAQB5learGuB/EWbij0vujUyiymKS4JyKjPYmxag== 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Michael Tokarev Fixes: 0694dabe9763847f3010b54ab3ec7d367d2f0ff0 Signed-off-by: Michael Tokarev Reviewed-by: Alistair Francis Reviewed-by: Palmer Dabbelt Acked-by: Palmer Dabbelt Message-Id: <20221105115329.306527-1-mjt@msgid.tls.msk.ru> Signed-off-by: Laurent Vivier --- hw/ssi/sifive_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ssi/sifive_spi.c b/hw/ssi/sifive_spi.c index 03540cf5ca66..1b4a401ca18a 100644 --- a/hw/ssi/sifive_spi.c +++ b/hw/ssi/sifive_spi.c @@ -267,7 +267,7 @@ static void sifive_spi_write(void *opaque, hwaddr addr, case R_RXDATA: case R_IP: qemu_log_mask(LOG_GUEST_ERROR, - "%s: invalid write to read-only reigster 0x%" + "%s: invalid write to read-only register 0x%" HWADDR_PRIx " with 0x%x\n", __func__, addr << 2, value); break;