From patchwork Wed Jun 29 09:08:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12899632 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 4F332C43334 for ; Wed, 29 Jun 2022 09:16:35 +0000 (UTC) Received: from localhost ([::1]:59572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6ToI-0002Ct-14 for qemu-devel@archiver.kernel.org; Wed, 29 Jun 2022 05:16:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6ThD-0000k8-Gz; Wed, 29 Jun 2022 05:09:21 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:43615) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6Th9-0003Yw-8P; Wed, 29 Jun 2022 05:09:15 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mv2gw-1np5KX3Fdg-00r4Nr; Wed, 29 Jun 2022 11:08:53 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Guo Zhi , Thomas Huth , Laurent Vivier Subject: [PULL 01/11] vga: avoid crash if no default vga card Date: Wed, 29 Jun 2022 11:08:39 +0200 Message-Id: <20220629090849.1350227-2-laurent@vivier.eu> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220629090849.1350227-1-laurent@vivier.eu> References: <20220629090849.1350227-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:azTnpUKTZfo4xzjCQoghh7P2LUaXo1R+Utkh9IhCQAvJVcjI/sd 89U70f/fVIbzaPzJ7QcDbmbTwCaFh/kHvCd0pCB3UgJlhw7b/1eDLRyDO+o1SPsCx2XEZUF D6G0dA0OPYXa3QKDhsYtgQCFVoq7hBnDqaAvbExf0JDAnKBaEJsAL5WJc465UczQddaCtCB 86wU0i5ELAIZ8j183tY1g== X-UI-Out-Filterresults: notjunk:1;V03:K0:XPf0SWDxnOc=:5aA9rwzkfdrdY1HuQyMl/G DSS6GETAWTOfZndAfcpUprC7Ub5J4av0RRhV3s+pL4gaL8hODFaDweCc0dI0BO4cPj7QqELUt cspkgpQhboW/2ZyqMeNigZuxVNTkFiR6xr0JivNkckqMnAcyMDuq+IVWKdDdJe3FqDLJdJFoY FSssOV1VPaNzBwX2Av+Hjjc10LdKntBd2JhP4ew7EFNCh8Sy87F+YOvlCEbjsOrR1iC5ONOqV xTsFQNkyTai4iTsOwGs0aVC2TbQG/8U/t3vMcORCT8qL7FFgktqwRTNt7stAIE+NwW7Hh/pRj wotLyRY2SKrir60Hii0uyfxaza+3KBA6YkENZhec4tJsWDJKQlQlSJeJ6P5S6ShwgTTIUGv15 dHhRSGDLx6o6hDcN3zZdG0Oor7jO7sJnQhgj4f6bFCmaeo4nfUdPb3sTbYu2agWWWI1mRb03K ygvVZFmm3onVBtRCMWMnvdvAFBbzGbqTUQHJ2niiLRES9+78bFnCECHCa6nxL+IdJvZS+Y/c7 afn/mEJAmYYzJBahnuXaaqkTEiYgCX6n4syEJlIzTihHI+Pw11uTl0z/YiOYLighsGJP43LiU lzI5hoCb9JS2f8QQZ1Chibvz1Bc0qg7U03GqpNwuqcmpUHC5CcXHStCYNV6JE3PZViCttBvDI MedruOYSfNV18IoTnGWQ5TbgiB3zqDbFbLnQCZ7xytzzvtgObOFe6+IK0lU7zQ0BFGPmRynof hVX9shMRLZEoda9zQxbATMI1i3SOoUqLyM4wmw== 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_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" From: Guo Zhi QEMU in some arch will crash when executing -vga help command, because there is no default vga model. Add check to this case and avoid crash. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/978 Signed-off-by: Guo Zhi Reviewed-by: Thomas Huth Tested-by: Thomas Huth Message-Id: <20220503091724.970009-1-qtxuning1999@sjtu.edu.cn> Signed-off-by: Laurent Vivier --- softmmu/vl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index b24772841db3..3f264d4b0930 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -981,7 +981,8 @@ static void select_vgahw(const MachineClass *machine_class, const char *p) if (vga_interface_available(t) && ti->opt_name) { printf("%-20s %s%s\n", ti->opt_name, ti->name ?: "", - g_str_equal(ti->opt_name, def) ? " (default)" : ""); + (def && g_str_equal(ti->opt_name, def)) ? + " (default)" : ""); } } exit(0); From patchwork Wed Jun 29 09:08:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12899640 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 30A2EC433EF for ; Wed, 29 Jun 2022 09:24:18 +0000 (UTC) Received: from localhost ([::1]:46532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6Tvl-0004pZ-77 for qemu-devel@archiver.kernel.org; Wed, 29 Jun 2022 05:24:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34302) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6ThC-0000k0-5J; Wed, 29 Jun 2022 05:09:20 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:35561) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6Th9-0003ZV-8N; Wed, 29 Jun 2022 05:09:13 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MCs9W-1nxiFS2LWS-008pgN; Wed, 29 Jun 2022 11:08:54 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Damien Hedde , Peter Maydell , Markus Armbruster , Laurent Vivier Subject: [PULL 02/11] qom/object: Remove circular include dependency Date: Wed, 29 Jun 2022 11:08:40 +0200 Message-Id: <20220629090849.1350227-3-laurent@vivier.eu> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220629090849.1350227-1-laurent@vivier.eu> References: <20220629090849.1350227-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:XVOeTItIsmtsh/ZS23VfCIf2jpA/NmPvJcxexAWW6fNkcGI99QA fIKmPMArv53+FnlaSNKBcfCWnfcbR0904n1LgTa6m7X5YTBKrIgYka7y7LLS6nAGoF924qk 5t3qdyMq1mAJKfiUX+v4xxEeCr3+MU1Ue0azMNUhPQdrX7hlEtyxs1QCvE1rlCA/ruZ/zw6 NxjHut+5ceUQje8x3kg9Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:7fXEQMb6Qis=:z4dsr4NxUIWwlFjIBFsBF/ MB6H0Bus42PkEx/VZsqvDKZzE9iMKSHPImVWA7dM+Syhq88YLGhu/0JgrbRrwShotntl0dq0Y yrVLA3KOCd8Ty0uh3KVDGL2NhgOCcqwtM++j+4zwvbwo5YQvqKkN77u0C5g/N+wDZtxYlPFWe oZ2YN0I45yyknW5jbxkul+DDJl2UBh6HiEANA2zwuIxUd9dVgaf9azpI/L//xUgL3t5xz3D+x YHkUk4zJH9JPIDrHD8KQtEx09CrlYPzgj6sTB94PxVKhI+w/Mlhxy2a9WbxX1zQW1YJkC5Nwy xBx5frzp597K6YehpUgrXhVIhlZLYe7MXrKcsnB4b+QB2W6rUopLHxfQWN4QCAnarX6yOkDKA Vf6LQCgzpK5oj0MeH6ujuG7yqb3BZuVidZOwBoHzupRgL0J9gIaUygJRRY8tG0Arr821Kprvw qo7iZzED95G45eOmoBK2+Y/uMk6LLAERWb9C6cwc7vcle1Chntc97MZRLlA8Fqa8KTlecRoyb S0G1TjNoUOjokZjzh5P8EbMdHKoiy6eajujSb0PQRfQgcu7KTbG/gfwJUTdtmV4aMKsBV+b6P ol1SM4LgDVHQUBasI9XzHiOzWpK3B4gxXFMlXugjmo3+3XO1MBCcuUdWB7sToSHO0V7wlauvL HezdLSMprPfBFRoEmjx96EE8OHpCLn0m68tGHRndBzQxetVpRQ8MyJZK+i4U60CyjEWqk69DH jzLs94jO79j8i8nI0/PzNhsvOGzWTLL9TYHW/g== 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, T_SCC_BODY_TEXT_LINE=-0.01 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" From: Philippe Mathieu-Daudé "qom/object.h" doesn't need to include itself. Fixes: db1015e92e04 ("Move QOM typedefs and add missing includes") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Damien Hedde Reviewed-by: Peter Maydell Reviewed-by: Markus Armbruster Message-Id: <20220509084659.52076-1-philippe.mathieu.daude@gmail.com> Signed-off-by: Laurent Vivier --- include/qom/object.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/qom/object.h b/include/qom/object.h index 5f3d5b5bf532..ef7258a5e149 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -16,7 +16,6 @@ #include "qapi/qapi-builtin-types.h" #include "qemu/module.h" -#include "qom/object.h" struct TypeImpl; typedef struct TypeImpl *Type; From patchwork Wed Jun 29 09:08:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12899620 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 94D96C433EF for ; Wed, 29 Jun 2022 09:12:45 +0000 (UTC) Received: from localhost ([::1]:50762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6Tka-0004V0-IE for qemu-devel@archiver.kernel.org; Wed, 29 Jun 2022 05:12:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6Th0-0000fu-MV; Wed, 29 Jun 2022 05:09:10 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:44405) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6Tgy-0003XC-8M; Wed, 29 Jun 2022 05:09:02 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Ml72g-1nLM9z0irc-00lSDb; Wed, 29 Jun 2022 11:08:55 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, =?utf-8?q?Eugenio_P=C3=A9rez?= , Jason Wang , Peter Xu , Laurent Vivier Subject: [PULL 03/11] util: Return void on iova_tree_remove Date: Wed, 29 Jun 2022 11:08:41 +0200 Message-Id: <20220629090849.1350227-4-laurent@vivier.eu> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220629090849.1350227-1-laurent@vivier.eu> References: <20220629090849.1350227-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:THIGnkSvYpEWKX1yZONqBqij9GZ9aV8mn/ItZHV48iVMivPp6+k ZUFtZYyLdMTuUB+2B1U2xI075ofW/k+tq3KgLFfS0aN1GhawXu/2eEhAVpdDwCeOkOjzopQ 975/7wdWes79B1yP+KEX8XqvHWWygLXSdOXnFWnkHdiKwC1O6FXOg0OB1StkSjHrqw7tBCY EiA9A4ZbJanAh+sny5fGw== X-UI-Out-Filterresults: notjunk:1;V03:K0:MU3bVoj9NwQ=:JmyAcmmfAVM9X7pjUfcY2O Pstqj1W+kPH8vM3qkiB6lt0vaDcClRSdrJwv+opXxVWghOadsWudRGooyGbhjZFJA/Gqx4LyX XgM72bZvYZr6zBBmSexSxhW0NWIeC2weae7pKMiSbh6oBoDJwRskf5/Q6R6hQCnI9J1TClyBg Alvj+9AsmJLKNy/b1n3/llrvlIZsG3snEUkjKnTi6KNkpZYthFa4Ey6bmhLEgX6tyAjilKIJa 8gq8uVH1jIABeV18FGW9m5pz3DiIJEYYdY1qCMwl6v8wbZswdz0GTBfD+Fx6CBJSTsReZjO6q AaRM6xeB8ANEYktJc//shDXWTjW/AIZhkF8l8Jq2oHgDU/u+WZC0RznVlvlCDKQwZ+25YL6CH YIj5A+FO5Qi5HGuc3lMJj3Ir0Jv8UoztQnSXmUfLV34kSwR+ErkKSZwYiZ3qIJHWQpXWcEeSs Pfm96u6fVtxLQl0H8HitVltB8YoCR7Q+lIAAou3N6FJ9qRjOY+NLBu5MFpXHRS0+Dmss654NZ 2mWctkkr41B8JZo2bCJ3U5Ej/w8YTpCLnZoE44iRmA0joyL6HpgajUuDcsv5rd9Okz7Debi6P 46TQVsmmhgpeUDTC0pVQ6rnQfO2thlYX6ZzPD9SjRzhlzx2E41sm3a2LyoTmxLpSetAbymlf+ aUN7Tn/Idv3H8maKVjDZQ6To9G2s/sus3Z8oKifzxnLWHYjvxKxwlq+nldJ5k+V6PJQn+c+f6 ZyEACiYMqzPS+LiBzIuMFojronQxWvzO25wthQ== 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, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" From: Eugenio Pérez It always returns IOVA_OK so nobody uses it. Acked-by: Jason Wang Reviewed-by: Peter Xu Signed-off-by: Eugenio Pérez Message-Id: <20220427154931.3166388-1-eperezma@redhat.com> Signed-off-by: Laurent Vivier --- include/qemu/iova-tree.h | 4 +--- util/iova-tree.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/qemu/iova-tree.h b/include/qemu/iova-tree.h index c938fb07933a..16bbfdf5f8d7 100644 --- a/include/qemu/iova-tree.h +++ b/include/qemu/iova-tree.h @@ -72,10 +72,8 @@ int iova_tree_insert(IOVATree *tree, const DMAMap *map); * provided. The range does not need to be exactly what has inserted, * all the mappings that are included in the provided range will be * removed from the tree. Here map->translated_addr is meaningless. - * - * Return: 0 if succeeded, or <0 if error. */ -int iova_tree_remove(IOVATree *tree, const DMAMap *map); +void iova_tree_remove(IOVATree *tree, const DMAMap *map); /** * iova_tree_find: diff --git a/util/iova-tree.c b/util/iova-tree.c index 6dff29c1f62d..fee530a57919 100644 --- a/util/iova-tree.c +++ b/util/iova-tree.c @@ -164,15 +164,13 @@ void iova_tree_foreach(IOVATree *tree, iova_tree_iterator iterator) g_tree_foreach(tree->tree, iova_tree_traverse, iterator); } -int iova_tree_remove(IOVATree *tree, const DMAMap *map) +void iova_tree_remove(IOVATree *tree, const DMAMap *map) { const DMAMap *overlap; while ((overlap = iova_tree_find(tree, map))) { g_tree_remove(tree->tree, overlap); } - - return IOVA_OK; } /** From patchwork Wed Jun 29 09:08:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12899633 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 295CEC433EF for ; Wed, 29 Jun 2022 09:16:59 +0000 (UTC) Received: from localhost ([::1]:60552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6Toe-0002sH-JL for qemu-devel@archiver.kernel.org; Wed, 29 Jun 2022 05:16:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6ThA-0000iC-W3; Wed, 29 Jun 2022 05:09:13 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:58471) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6Th7-0003YJ-Fo; Wed, 29 Jun 2022 05:09:12 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MMFZQ-1oNabJ3iNS-00JNWb; Wed, 29 Jun 2022 11:08:56 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, "Dr. David Alan Gilbert" , Daniel Henrique Barboza , Klaus Jensen , Laurent Vivier Subject: [PULL 04/11] Trivial: 3 char repeat typos Date: Wed, 29 Jun 2022 11:08:42 +0200 Message-Id: <20220629090849.1350227-5-laurent@vivier.eu> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220629090849.1350227-1-laurent@vivier.eu> References: <20220629090849.1350227-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Gv0Mt8zBgpMXUNczN7rVgALsdsBgreuq62exH7QyFAfOPPw1BVg MzX8y85d7atk9994RCBSZU04lLJfyD7YusenrOSbNcxDvIKWP/eRJvVKaumSHTXVW8bYU+z AUZlwfceyI2G/MQ33vNtitRPFSYHlPgDcY7i3+KHx2gWTBN88fm8M8n8RMvm9NoO1Q9CxXH JMHMZPylEshbqbdyf4YHg== X-UI-Out-Filterresults: notjunk:1;V03:K0:AZp0CD+6sis=:2JhQMXswH954DQDV1WwZbJ 54Ti6E+eDWyJMy2f4C82ymMvfgFBYJ2BaGyp3m0ptOp3hdUpjChqPeqgEY8ERcsbqo7MBOyM1 u0yQGCbkRid6w5z1svUigHCJEjFMjCxIHMmoD86ugqGpylhAufvpAKorP43qzZPzeqsjuAqYf znS4Js8ob4um3CXIPwj+1KfCu8D3Qqiw59EyIMZMuNnG+lqSXu+YBCqutohGIsLRxONEi5D8a BgvNQRvNhXxIIiG+2sPpPqYWfSDJMDm2Dz7iBjlMlIKOmNLbbcnevsIAOUfwXbvn53STR/5Pl 6bebbruuvZxfUqoB9c6j3ISVbuaID4wkYqnzimuQl1lf0qejY1K0E7p2Mx+K1+wnqrz2cWzOC GOEiBP7IA/nLDSTk4KIaI0rmeYLbwF+jjVo3NZsvBRyZtC+IIoZbKxlWekqUYJtSUe70rVCFK R+ijfnndCn9fu/ggPFrknp5zgJ2VetoivKmAgLy/m9bxC9l/WhZ8aFCHdhV9Ss4ZdFZuSk/DE Jn1tM0HEMgEiExiMeBMZhkXUCj2RLTjnrvQ2McAn8FEOZzkkVZJuAL9SvPgOdO/2zifsqjijL 0eoaOxwHwEO2RsBzoyWpUy47ZEw88N8L40jVYnmI3cSX9Sn51LdID3rH37F+Mk0xaqHZ1BWCt pLeYcXVbGnTh3mOpUR1ZK4mwvmiANXt5F5L6eHZUfpH0nX/AB//9jjqrlP3Pb1WB74iWct8gC 70YaryaV7yj/7HWCTYYOPKfTe8PMOQovN2ezrw== 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, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" From: "Dr. David Alan Gilbert" Inspired by Julia Lawall's fixing of Linux kernel comments, I looked at qemu, although I did it manually. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Daniel Henrique Barboza Reviewed-by: Klaus Jensen Message-Id: <20220614104045.85728-2-dgilbert@redhat.com> Signed-off-by: Laurent Vivier --- hw/intc/openpic.c | 2 +- hw/net/imx_fec.c | 2 +- hw/pci/pcie_aer.c | 2 +- hw/pci/shpc.c | 3 ++- hw/ppc/spapr_caps.c | 2 +- hw/scsi/spapr_vscsi.c | 2 +- qapi/net.json | 2 +- tools/virtiofsd/passthrough_ll.c | 2 +- ui/input.c | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index 49504e740f33..b0787e8ee78c 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -729,7 +729,7 @@ static void openpic_tmr_set_tmr(OpenPICTimer *tmr, uint32_t val, bool enabled) } /* - * Returns the currrent tccr value, i.e., timer value (in clocks) with + * Returns the current tccr value, i.e., timer value (in clocks) with * appropriate TOG. */ static uint64_t openpic_tmr_get_timer(OpenPICTimer *tmr) diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index 0db9aaf76a01..8c11b237de70 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -438,7 +438,7 @@ static void imx_eth_update(IMXFECState *s) * assignment fail. * * To ensure that all versions of Linux work, generate ENET_INT_MAC - * interrrupts on both interrupt lines. This should be changed if and when + * interrupts on both interrupt lines. This should be changed if and when * qemu supports IOMUX. */ if (s->regs[ENET_EIR] & s->regs[ENET_EIMR] & diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c index 92bd0530dd24..eff62f394557 100644 --- a/hw/pci/pcie_aer.c +++ b/hw/pci/pcie_aer.c @@ -323,7 +323,7 @@ static void pcie_aer_msg_root_port(PCIDevice *dev, const PCIEAERMsg *msg) */ } - /* Errro Message Received: Root Error Status register */ + /* Error Message Received: Root Error Status register */ switch (msg->severity) { case PCI_ERR_ROOT_CMD_COR_EN: if (root_status & PCI_ERR_ROOT_COR_RCV) { diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c index f822f18b9806..e71f3a748378 100644 --- a/hw/pci/shpc.c +++ b/hw/pci/shpc.c @@ -480,7 +480,8 @@ static const MemoryRegionOps shpc_mmio_ops = { .endianness = DEVICE_LITTLE_ENDIAN, .valid = { /* SHPC ECN requires dword accesses, but the original 1.0 spec doesn't. - * It's easier to suppport all sizes than worry about it. */ + * It's easier to support all sizes than worry about it. + */ .min_access_size = 1, .max_access_size = 4, }, diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c index 655ab856a01b..b4283055c121 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.c @@ -553,7 +553,7 @@ static void cap_ccf_assist_apply(SpaprMachineState *spapr, uint8_t val, * instruction is a harmless no-op. It won't correctly * implement the cache count flush *but* if we have * count-cache-disabled in the host, that flush is - * unnnecessary. So, specifically allow this case. This + * unnecessary. So, specifically allow this case. This * allows us to have better performance on POWER9 DD2.3, * while still working on POWER9 DD2.2 and POWER8 host * cpus. diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index a07a8e1523f6..e320ccaa2385 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -1013,7 +1013,7 @@ static int vscsi_send_capabilities(VSCSIState *s, vscsi_req *req) } /* - * Current implementation does not suppport any migration or + * Current implementation does not support any migration or * reservation capabilities. Construct the response telling the * guest not to use them. */ diff --git a/qapi/net.json b/qapi/net.json index d6f7cfd4d656..9af11e9a3bb2 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -298,7 +298,7 @@ # # @udp: use the udp version of l2tpv3 encapsulation # -# @cookie64: use 64 bit coookies +# @cookie64: use 64 bit cookies # # @counter: have sequence counter # diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c index b15c631ca512..7a73dfcce901 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -2319,7 +2319,7 @@ static int do_lo_create(fuse_req_t req, struct lo_inode *parent_inode, * If security.selinux has not been remapped and selinux is enabled, * use fscreate to set context before file creation. If not, use * tmpfile method for regular files. Otherwise fallback to - * non-atomic method of file creation and xattr settting. + * non-atomic method of file creation and xattr setting. */ if (!mapped_name && lo->use_fscreate) { err = do_create_secctx_fscreate(req, parent_inode, name, mode, fi, diff --git a/ui/input.c b/ui/input.c index 8ac407dec485..e2a90af889ee 100644 --- a/ui/input.c +++ b/ui/input.c @@ -364,7 +364,7 @@ void qemu_input_event_send(QemuConsole *src, InputEvent *evt) * when 'alt+print' was pressed. This flaw is now fixed and the * 'sysrq' key serves no further purpose. We normalize it to * 'print', so that downstream receivers of the event don't - * neeed to deal with this mistake + * need to deal with this mistake */ if (evt->type == INPUT_EVENT_KIND_KEY && evt->u.key.data->key->u.qcode.data == Q_KEY_CODE_SYSRQ) { From patchwork Wed Jun 29 09:08:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12899643 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 3044CC43334 for ; Wed, 29 Jun 2022 09:29:43 +0000 (UTC) Received: from localhost ([::1]:54826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6U10-0002XM-76 for qemu-devel@archiver.kernel.org; Wed, 29 Jun 2022 05:29:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6ThD-0000k6-CH; Wed, 29 Jun 2022 05:09:21 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:42617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6Th9-0003YK-8O; Wed, 29 Jun 2022 05:09:15 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MPXMa-1oKHDm2M4I-00MfJl; Wed, 29 Jun 2022 11:08:56 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, "Dr. David Alan Gilbert" , Klaus Jensen , Laurent Vivier Subject: [PULL 05/11] trivial typos: namesapce Date: Wed, 29 Jun 2022 11:08:43 +0200 Message-Id: <20220629090849.1350227-6-laurent@vivier.eu> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220629090849.1350227-1-laurent@vivier.eu> References: <20220629090849.1350227-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:qxsvthMUJQXPZdEjDzghaMoaRrYcSc280reHISYYXR8m6VwjOeO c27rRotK7MTu4hzDMhjSj+j4IZOOi7VXMQZQWi6ID27CcpD121uKsFCFKM1hgCMM2rvbLgq LupR7MnX2HCVoXbmsWnX6OP+4U/sT9XS/uOQ9gLg6T+cKEIIb0jUcEPirByDIFNtL6uKDWq D1EyOpaI/QJSBkVQYulQg== X-UI-Out-Filterresults: notjunk:1;V03:K0:tqVxDB8dg8k=:2jz7OiMwCmtJb1w8ClQZw8 gOzBcFFLzmgOlYCJKbeVLcgBQB1GwxL0/ShZHSFsYZ6690sTX5dYYM9TPm0Hh4q5dJ75uKOYv YYwNIq466sH7qwBj3MsnTgvFSRFGvBgzYuveb3mRLDZg3LZqXpSMYovxzJ1l7T+os+r0Dgn/l 5WE0YuDkDMTQENZ/CTJxjnR9oODTz5f8caT0P++LL73xjAr8Vn7aCM0thK7+7/7fEsoDPvCWM XzM5OWXm3t+6/V0mboPVLNYUzjrQSW2cOP4uqD6k6bwxqQyarwaG3r2kz4jySu7Yvi3Tji3o9 NItdCsGhCXHCWNGgxLw4LDz+OLg4okZGlO59eUmEvdI4V28qw0/zwbX+6pCIXDEAAs1hVPLKa dRpfxRk8RVz9zbnNXRu1qit3OO0gA5gVY2xhabfgyi4g9nWVZoelihZZmmo9GP4hdmfmFLpc0 XJQPOJWyQt8Xc10CzjJ8HV/P94nsQl3BlzHO1AnzqMFeNCaZ4trzA+JPgOnamAQ9bx3cxX51d EeWtbrFS1KtyX9WRndq4ZiW2R4a8nQjaSITEaINr0LeaPYXtdyB4xg/mlHXzEPVa3GgsxGBD1 xygFU5Qtq1wxm0G5PNec9NE8SVqU/FWhFpqVwxc2WJx/aAwDT47w+dC3ph68byVdUBG883cmT KqRdsmVS8UC3x52FnxioqfqQBSzjuh8CYdPSF0mZvT7BgG7xRj2W4lqDIx0QH+grtK7H4XJ2m Z1NtwY9S/ocY+Ig7+vO2tqTS01m73i/Hvv7aeg== 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, T_SCC_BODY_TEXT_LINE=-0.01 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" From: "Dr. David Alan Gilbert" 'namespace' is misspelled in a bunch of places. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Klaus Jensen Message-Id: <20220614104045.85728-3-dgilbert@redhat.com> Signed-off-by: Laurent Vivier --- hw/9pfs/9p-xattr-user.c | 8 ++++---- hw/acpi/nvdimm.c | 2 +- hw/nvme/ctrl.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/9pfs/9p-xattr-user.c b/hw/9pfs/9p-xattr-user.c index f2ae9582e610..535677ed609b 100644 --- a/hw/9pfs/9p-xattr-user.c +++ b/hw/9pfs/9p-xattr-user.c @@ -27,7 +27,7 @@ static ssize_t mp_user_getxattr(FsContext *ctx, const char *path, { if (strncmp(name, "user.virtfs.", 12) == 0) { /* - * Don't allow fetch of user.virtfs namesapce + * Don't allow fetch of user.virtfs namespace * in case of mapped security */ errno = ENOATTR; @@ -49,7 +49,7 @@ static ssize_t mp_user_listxattr(FsContext *ctx, const char *path, name_size -= 12; } else { /* - * Don't allow fetch of user.virtfs namesapce + * Don't allow fetch of user.virtfs namespace * in case of mapped security */ return 0; @@ -74,7 +74,7 @@ static int mp_user_setxattr(FsContext *ctx, const char *path, const char *name, { if (strncmp(name, "user.virtfs.", 12) == 0) { /* - * Don't allow fetch of user.virtfs namesapce + * Don't allow fetch of user.virtfs namespace * in case of mapped security */ errno = EACCES; @@ -88,7 +88,7 @@ static int mp_user_removexattr(FsContext *ctx, { if (strncmp(name, "user.virtfs.", 12) == 0) { /* - * Don't allow fetch of user.virtfs namesapce + * Don't allow fetch of user.virtfs namespace * in case of mapped security */ errno = EACCES; diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 0d43da19ea42..5f85b1632706 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -476,7 +476,7 @@ struct NvdimmFuncGetLabelDataOut { /* the size of buffer filled by QEMU. */ uint32_t len; uint32_t func_ret_status; /* return status code. */ - uint8_t out_buf[]; /* the data got via Get Namesapce Label function. */ + uint8_t out_buf[]; /* the data got via Get Namespace Label function. */ } QEMU_PACKED; typedef struct NvdimmFuncGetLabelDataOut NvdimmFuncGetLabelDataOut; QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncGetLabelDataOut) > NVDIMM_DSM_MEMORY_SIZE); diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index d349b3e42620..ca335dd7da6d 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -76,7 +76,7 @@ * the SUBNQN field in the controller will report the NQN of the subsystem * device. This also enables multi controller capability represented in * Identify Controller data structure in CMIC (Controller Multi-path I/O and - * Namesapce Sharing Capabilities). + * Namespace Sharing Capabilities). * * - `aerl` * The Asynchronous Event Request Limit (AERL). Indicates the maximum number From patchwork Wed Jun 29 09:08:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12899618 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 BA438C43334 for ; Wed, 29 Jun 2022 09:12:31 +0000 (UTC) Received: from localhost ([::1]:49820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6TkM-0003jW-O7 for qemu-devel@archiver.kernel.org; Wed, 29 Jun 2022 05:12:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6Th8-0000gn-Ti; Wed, 29 Jun 2022 05:09:11 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:58063) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6Th0-0003Xp-7v; Wed, 29 Jun 2022 05:09:03 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N1xdf-1neP8y0i0v-012IeE; Wed, 29 Jun 2022 11:08:57 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Markus Armbruster , Richard Henderson , Laurent Vivier Subject: [PULL 06/11] MAINTAINERS: Add softmmu/runstate.c to "Main loop" Date: Wed, 29 Jun 2022 11:08:44 +0200 Message-Id: <20220629090849.1350227-7-laurent@vivier.eu> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220629090849.1350227-1-laurent@vivier.eu> References: <20220629090849.1350227-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:abL5tc+B3yNhbcfKumKVvoYg4XJlvk/tfJ69LZyJTeQKSE0+5JO ynYVuLqA60X70n6rkTBHdqJZs4ySrvv6BbBS4u/eV3IDdGgRtLfNg3lajLeQ0W94M3CmuMU eP3rsDgHE2dqcZJkgo/rOJb1iO9iMF/FJugKnIKyqgLQYPTJJ3mcBG/56CHfmLUFQedOrJg xb5JkqhFT6vpl8c671GlA== X-UI-Out-Filterresults: notjunk:1;V03:K0:SKWzV9gaJFc=:gdbRDEABByMalj7T4R9Yy9 RYdSRXhJlQLmuKVJukNfgegqNvL3JBCaPH83scI8z90bmcvcTsNJTasMw3sg3n0SA6tre4HLR 85UnnYZnQDc33OtTa+2QmL7yNFFXjyoHYKOzKMHzgqzaYbSUBPpAwxMhJwaY62k++8MPw6h41 eB1cl7yodxMUzNC6jgRn1vuvoKbZus9PNzsoIUCX+uS5gesufwlhJJz+CUBHdDud7SzYedgWd sQJwmYA1nQlAvGyPsZ/Db0nQ4jbu49FM4WQ4HnuLCrwKPPLjpqXkV42fzFS99mqwdltI+ygXj d64BdapKEyeoXXME63dBj+zFnJI5A7Bl1knn2fJnnjxU0LjLk3um48GVjH2ns7sWGjednMlaq lL8kf3WM1z3ZtX6sU12HW276th7T8Zz8plzOLOMU3XSz7YuPhO8T4T4IRrD9G7h2v9eLu+evb wV/Pm5EROwyWYd7DBV031Shojzb+61QLgRF29ZMyLOau6S4t520urzRYy+MusJ99PolG0/Rwi LI46xc/H9MQNGwSGT4xcxGDgqcogt7tdNZ1BAbI9kiwIdhddQGgS2UCqj0ag9E5k73QvY5D/u XxGOA7xGGEI52nz/YVqYff2SDOejLvTbImrYrGa+Sbtvz2m+FGMn2MQsGKRNjdoyc6qUlUlho cfgzz44J9fHRjDNWHSW8Ro+OmlAO+mXc/PsAykSYdHz/4PM6cUeIoqPKW61caxCes+z4q483t 4jOkY9wJBZRAd95UE3b7f3493bUjkCLhi82MZw== 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_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" From: Markus Armbruster Signed-off-by: Markus Armbruster Acked-by: Richard Henderson Message-Id: <20220615122338.340426-1-armbru@redhat.com> Signed-off-by: Laurent Vivier --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 1cbd6b72fa64..b8637c6f5254 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2746,6 +2746,7 @@ F: softmmu/cpu-throttle.c F: softmmu/cpu-timers.c F: softmmu/icount.c F: softmmu/runstate-action.c +F: softmmu/runstate.c F: qapi/run-state.json Read, Copy, Update (RCU) From patchwork Wed Jun 29 09:08:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12899631 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 4FBD4C433EF for ; Wed, 29 Jun 2022 09:16:32 +0000 (UTC) Received: from localhost ([::1]:59474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6ToF-00029U-6q for qemu-devel@archiver.kernel.org; Wed, 29 Jun 2022 05:16:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6Th0-0000fy-WF; Wed, 29 Jun 2022 05:09:10 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:51105) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6Tgy-0003XS-Ok; Wed, 29 Jun 2022 05:09:02 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MORR2-1oGytr3Vra-00Px6P; Wed, 29 Jun 2022 11:08:58 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Bernhard Beschow , Mark Cave-Ayland , Laurent Vivier Subject: [PULL 07/11] hw/pci-host/i440fx: Remove unused parameter from i440fx_init() Date: Wed, 29 Jun 2022 11:08:45 +0200 Message-Id: <20220629090849.1350227-8-laurent@vivier.eu> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220629090849.1350227-1-laurent@vivier.eu> References: <20220629090849.1350227-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:UW6Qo2efnOFQMuP8uIVAPpQiETGQYtE3AzDHIo8hEKTtE6rQ50l yNqReuLs1Hm8z1SUrxYAP7jRPf20FwclvABlTsWYBA33urNzdH99FqzKO6887N98WyH3H/3 cnU22Um8afgH+lR4ltWrUYai7XoLawIk98O0CyVa+YU1AZ477dkp2gxwX60pC8CtDP2JfQQ vvVJYfgnSqmnYUn4fi/Ug== X-UI-Out-Filterresults: notjunk:1;V03:K0:QAkajim2xxQ=:Ryjfal/zWPojTfZLL22m3s bsm76jbIpB/VNE5LPEzRaHuDNztxgx8Joy/fO4vPX4XdRO6O8HVe+pZvdS0LYBP13Z2LSId72 WJS7H2syW3684N9iaGtQoMt+bs341zPfMyhifP/H/lWdZOTHlWddlRSWeshBw6iNDHghIwYnO /yvidqT837lCDfO6XQVe4dcYdDuHeh74sU/dnc6/fCZnL8fNuiwco+UHzOYt8m85Eo89nXtAN mX+YxcZeQJWyKqEnMfdNdzcNhTQdTZFwx3REDAhcd410nDYMQZQFToHzkyPFfzYf0qSYQJDez BmgxI/OB9uCrChEV9Q4SYFXSY8VySKmHu7myIvdHmaIocM+bnVoyv8V/8jBeI32+iF3sX0Dmk Jxy0lIajEF7pq1wetPk7t/vLtCuRSvpoE8w6+q0YL5o+JLVb3mNBiemm8GXhF7x0sYd/OvLPk 6Y19SyXXkv74IthA8JM8S07WN2d1c3vOeWra0v0Ec6YSIT6mip+M0Irvr4uF+0ZUlk+760Jaw NS0XLg80PJ4dn7IctMimWA81oHp/Ojsrn57teeGZwieR7obZwZE7KlVvbpxBwA5PGKKhNOGCJ fM8Y4KNsOJGMBDND2Oze8K3YrkvkKrUe+Otq4eGdL0Ft60okTJJR5cVDFTueWJwPhJLIjSRvF oakkGImgfMmNEhwtgY1LsfReGq3lx1qCnEWTBItpYrg1F0+oGXqOnyMIpD7NoNW3alHWirhbW 5wIdpka0rlyMEup3FqnfZBpyCNxpg5WKrci9VQ== 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_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" From: Bernhard Beschow pi440fx_state is an out-parameter which is never read by the caller. Signed-off-by: Bernhard Beschow Reviewed-by: Mark Cave-Ayland Message-Id: <20220612192800.40813-1-shentey@gmail.com> Signed-off-by: Laurent Vivier --- hw/i386/pc_piix.c | 3 --- hw/pci-host/i440fx.c | 4 +--- include/hw/pci-host/i440fx.h | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 0fc2361ffeda..a234989ac363 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -82,7 +82,6 @@ static void pc_init1(MachineState *machine, MemoryRegion *system_io = get_system_io(); PCIBus *pci_bus; ISABus *isa_bus; - PCII440FXState *i440fx_state; int piix3_devfn = -1; qemu_irq smi_irq; GSIState *gsi_state; @@ -203,7 +202,6 @@ static void pc_init1(MachineState *machine, pci_bus = i440fx_init(host_type, pci_type, - &i440fx_state, system_memory, system_io, machine->ram_size, x86ms->below_4g_mem_size, x86ms->above_4g_mem_size, @@ -217,7 +215,6 @@ static void pc_init1(MachineState *machine, isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0")); } else { pci_bus = NULL; - i440fx_state = NULL; isa_bus = isa_bus_new(NULL, get_system_memory(), system_io, &error_abort); pcms->hpet_enabled = false; diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index e08716142b6e..1c5ad5f918a2 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -238,7 +238,6 @@ static void i440fx_realize(PCIDevice *dev, Error **errp) } PCIBus *i440fx_init(const char *host_type, const char *pci_type, - PCII440FXState **pi440fx_state, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, ram_addr_t ram_size, @@ -264,8 +263,7 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type, sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); d = pci_create_simple(b, 0, pci_type); - *pi440fx_state = I440FX_PCI_DEVICE(d); - f = *pi440fx_state; + f = I440FX_PCI_DEVICE(d); f->system_memory = address_space_mem; f->pci_address_space = pci_address_space; f->ram_memory = ram_memory; diff --git a/include/hw/pci-host/i440fx.h b/include/hw/pci-host/i440fx.h index f068aaba8fda..52518dbf08e6 100644 --- a/include/hw/pci-host/i440fx.h +++ b/include/hw/pci-host/i440fx.h @@ -36,7 +36,6 @@ struct PCII440FXState { #define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX" PCIBus *i440fx_init(const char *host_type, const char *pci_type, - PCII440FXState **pi440fx_state, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, ram_addr_t ram_size, From patchwork Wed Jun 29 09:08:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12899639 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 7BDACC43334 for ; Wed, 29 Jun 2022 09:21:06 +0000 (UTC) Received: from localhost ([::1]:39500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6Tsf-0007vh-LH for qemu-devel@archiver.kernel.org; Wed, 29 Jun 2022 05:21:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6ThC-0000k1-5a; Wed, 29 Jun 2022 05:09:20 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:49557) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6Th9-0003Z6-8M; Wed, 29 Jun 2022 05:09:13 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N7AAk-1nYbix3LNk-017VJb; Wed, 29 Jun 2022 11:09:00 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Thomas Huth , Michael Tokarev , Zhang Chen , Laurent Vivier Subject: [PULL 08/11] common-user: Only compile the common user code if have_user is set Date: Wed, 29 Jun 2022 11:08:46 +0200 Message-Id: <20220629090849.1350227-9-laurent@vivier.eu> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220629090849.1350227-1-laurent@vivier.eu> References: <20220629090849.1350227-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:vo5/ky3HxCpxN4GiWAWnszRGsYnJW6gcn4kq766y3yUrJqDKk4I Ok9IhxcCenMq7EbR5P+9CcmluxY/ESX5GPcTe96UH5q5g0Mry/zN3uZEewfGdQG/5ZD4ckS +VtXswVlTZKfpCrHsIoWrJCNUwNGFfwPZ56clu218QJ0NK5c3Gf6Scz2NhC0iw6ALf1yJL0 dWFSV5PPlNefU5y5Dd0Rg== X-UI-Out-Filterresults: notjunk:1;V03:K0:1UxnVJbY/k8=:7RyiZALtVjlhPLJi0D1xvV sufY/llIy2vCvCtofxt/eJO7RFNWkC9sYC5se5oR3XdWeOkjtafNdLREtzW5u0YHNCum9Cyfu FCQ9Y206Kw7wHZ8GIVSune8DPV6Kn0cPcamJ6osHU0reg7BMq88LtItRNYJTJ40/kaOi1Xf8W qc/+GpQDzCO57eUKueSw/T0X0iqsmlKGYGKdrkXtFB2xBk5uG2bQxpapcRpls5rdAawz3UOE6 UVPds7T+VQTLwIALRFHCdB2aXPQ3H/cHp7Bul2Kr2LQnCuL4FPbp24nviTAdlKvwq+LT893a9 B1aMuoouWgC6NL0YGT5MkbFGJsPfT0lLAUdqzM4If/YphSMt97qJwhUj7YmpD7P26bPEzOXaQ 7x4zDLjy9ywn9OksmSurmTWSROFVCFCdBm1EA64SGu+1ukiEQX6z7PqIRp648DFAIjPEa265O M9HT7fjuC7nMNerEyAZp1LJgNYJUXJheNw5iXpQKY6igqjw3Ye8UnlsiY6fABrimJf72wSWi5 cUHXAIVuv6ZmW7HzUzg+HdmW071OS0Uejxf+85WLD82jCcdi6iXvbK+LFA6gjyuz3KuPdl4hl wR7d6Xvgn9SLDgGRav315slZ2Ip8XDcAm7elGP6JvzFx+OB9lS7Rj94GrL8a+bBdUfumNC/4u 2TlEw85DDw18DxY4gib/4/kbvTlvUYc5n9buL6IrIwm40K0Auhcwgx9bKObcILl3fHXM0zxIQ ImF83ts/l5wHUCKvZfaHmuHd1lI8ASr6kSeq9w== 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_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" From: Thomas Huth There is no need to waste cycles here if we only compile the system binaries or tools. Additionally, this change is even a hard requirement for building the tools on systems that do not have an entry in the common-user/host/ folder (since common-user/meson.build is trying to add such a path via the include_directories() command). Reported-by: Michael Tokarev Signed-off-by: Thomas Huth Reviewed-by: Zhang Chen Message-Id: <20220622140328.383961-1-thuth@redhat.com> Signed-off-by: Laurent Vivier --- common-user/meson.build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common-user/meson.build b/common-user/meson.build index 26212dda5c7a..ac9de5b9e3f5 100644 --- a/common-user/meson.build +++ b/common-user/meson.build @@ -1,3 +1,7 @@ +if not have_user + subdir_done() +endif + common_user_inc += include_directories('host/' / host_arch) user_ss.add(files( From patchwork Wed Jun 29 09:08:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12899638 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 14D8FC433EF for ; Wed, 29 Jun 2022 09:20:54 +0000 (UTC) Received: from localhost ([::1]:39422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6TsT-0007s4-04 for qemu-devel@archiver.kernel.org; Wed, 29 Jun 2022 05:20:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6ThF-0000kF-IR; Wed, 29 Jun 2022 05:09:21 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:42569) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6ThA-0003Zl-Sx; Wed, 29 Jun 2022 05:09:16 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M4aA4-1o5vC71J38-001i9J; Wed, 29 Jun 2022 11:09:01 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Lev Kujawski , Laurent Vivier Subject: [PULL 09/11] hw/ide/atapi.c: Correct typos (CD-CDROM -> CD-ROM) Date: Wed, 29 Jun 2022 11:08:47 +0200 Message-Id: <20220629090849.1350227-10-laurent@vivier.eu> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220629090849.1350227-1-laurent@vivier.eu> References: <20220629090849.1350227-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:SCtBzSiIZmrPviMiR6mXkRJR80aYLUL4bsQC0WA9VSa9RLV0bEv D0OcbQUle/8PTMAg7P7PyhNB1eosbcK6Sqjd8x35a7LVm6EXv4iA/VkVjkbDYoD/XAcxieQ k1znXgEulpNBIujmKNGZ4xM7vT+HPTIZxqXMTjNCFGdZ6PVEoHeH6PAeXL4boDbTitkKwvq 07UFe6JoEzlV680CGkOjQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:g2Git6X65bg=:qVdp0lcKp0kmoXK/8dctP6 DPedxTjXMY2bdH3vVl6ctK4R+DNEtHa1qr2F7wEXPOgG4rKBisLvzqpcwcfsXP2OhQoP4hOQF qLuuA19gtVY6dIuJrxoL3aDZSbMGODbF8DnlFFTcAtgN+SQ0V0Pw7Cq/iubqjpUmO4jCutkmi p6u4mhc6KiT7FtqH0cQibxkrP30ypcineqRpbfh5PD1cwChCiflbLgaUl0ZzlCU4p07WtirJr lCtOsI9crJUHUEEbaLRTXVxuMXW0BssLfCmno6eOgmhQjiOClr+pFYWeWyImgHx+tHDb+nl1d dG+XjgOfIdI1miXRD/KWf1Qdk+yuRZdU9bespSRhE7tAS/QvVGIJr2QZ+sE11bjoUt9LURdRq OKCm4+n8D923GfVR4NVxQ/oms1WI+r4WMcDhtZozOMXd/mwma/PiB1xxysgZFhN+kAfgGQiyQ mh/h3znOR0IoHcjE8oY5qFbbY7Z8uqeI2epgl8sYVWWWmUhi5eJMIYpJOAFFl92VwoN56eZ4G 0+Z8jW13wwsZ0K9ZAxQ4/LJU4sTsJYFrX4ySp+79V2HarxSVCT/rn5RWz0lYt0G2llzKU0blx J5kMRt/67dcDN2RQ9ebuZxGqqL/xFKfLkwt1+QXFRnAwZ9eY6Gkm9pUWzC4w4V/1ByzwQ/2g7 Hkn4DclMsJEPekIKddkCvbfIu+YpEz215GPZoGfGmVwBuNRbLaPfqPrvz8uB4FNqEwZFaa7OP 7P/sUAjxykO7HMAl6XNTajVSN33qnzg+1xguVQ== 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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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" From: Lev Kujawski Signed-off-by: Lev Kujawski Reviewed-by: Laurent Vivier Message-Id: <20220528204702.167912-1-lkujaw@member.fsf.org> Signed-off-by: Laurent Vivier --- hw/ide/atapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index b626199e3def..88b2890fafe4 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -318,7 +318,7 @@ static void ide_atapi_cmd_reply(IDEState *s, int size, int max_size) } } -/* start a CD-CDROM read command */ +/* start a CD-ROM read command */ static void ide_atapi_cmd_read_pio(IDEState *s, int lba, int nb_sectors, int sector_size) { @@ -417,7 +417,7 @@ eot: ide_set_inactive(s, false); } -/* start a CD-CDROM read command with DMA */ +/* start a CD-ROM read command with DMA */ /* XXX: test if DMA is available */ static void ide_atapi_cmd_read_dma(IDEState *s, int lba, int nb_sectors, int sector_size) From patchwork Wed Jun 29 09:08:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12899637 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 35F60C43334 for ; Wed, 29 Jun 2022 09:20:06 +0000 (UTC) Received: from localhost ([::1]:38808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6Trh-0007SG-AU for qemu-devel@archiver.kernel.org; Wed, 29 Jun 2022 05:20:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6ThC-0000jz-5M; Wed, 29 Jun 2022 05:09:20 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:49093) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6Th9-0003Ys-8M; Wed, 29 Jun 2022 05:09:13 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MwxRN-1njIhx2ZxL-00ySuK; Wed, 29 Jun 2022 11:09:02 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Bernhard Beschow , Paul Durrant , Laurent Vivier Subject: [PULL 10/11] hw/i386/xen/xen-hvm: Allow for stubbing xen_set_pci_link_route() Date: Wed, 29 Jun 2022 11:08:48 +0200 Message-Id: <20220629090849.1350227-11-laurent@vivier.eu> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220629090849.1350227-1-laurent@vivier.eu> References: <20220629090849.1350227-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:+AOZAPEh4DyN88bVRueXwQ7rqqtNZOchrE07gwGOLFbVt39MaQJ a8vX47Zitk84jrmvCJ5uinLngOkn9mxB5Yai7EYFVgWNlS2jiz13sm4gWl0cUYljkkYAjE6 c9TffXAZjz7D2hRVMlt7A5s8OGU0ea+Q7O7p2KBaeQ00BZ6Eh8AQdYSc71vRZkuGtTGTj5U +WuPpduw3JzhEHgg1wbAw== X-UI-Out-Filterresults: notjunk:1;V03:K0:0qST8EF+KrM=:jdFmgsszbivrXI8YpWDG7J 5Go8rZ7T+m0FrggqHW3JGULCqiaRds8X9wo5yFapzOklscnpi/J7JqXtSq3MIUd1ChjUT/7pX qXT5w5fNVox+P4hBaTZ4jddnHT9ZTmv5plr4i3pnhGlpiHRBf9KVwCEoNd4eUAm4Dv/hlSuJu 93HV5O6JjnVYDJNs29v1sLqgo7B215yL90mW1Zb2npJgydBxOWsJoEFJsTXjCU7MwXFT7VZ9j 1DvT4I0xyEB3/tEVr3+iFUH74zWRhiUOiWMVHoqPu8ZNH8IcPh3r5g+MpBGYzPWtKL6Qbiqzm P8tolnwoqjJ9ExkGxNodSnNLhcOB2/KaC2SOovVkqVU4IFtbq7QVah9JFoaZWTvHuYD7/H3/L NoryISd7DuMX4Tzy3rpkke9fB52pw8Y5f/e6F4FPxMidTIlI1IHlttNxriAa39pjALNcYWZ7s fiyHIxChOD0l73H7RvJEo9nFs2Q54w3z5eDJEA/5s3Q7tHh72vczsZcRvgZupzEJ6NEr5KfEI 4DeWE15IaqSEwazT93NvZ/0rFOPv2CDeTVCgsAiD0KWE/PRt0wux1DYUWaEBBCkjmRQnJnqXl V9R668V2xKxTb+g4jKizTzVTMubf4bZ+Lzx3tjjWHBQXihkmFbyvQ3cwVqpduLKC15tXvTFeK buI3JH4OUF6xki0dXnQqDdHajWmfE2nZQtqRJ3Ryh8ltn11AoCJ6KhX57xeSrCuy0IvpV6rbK LJ9ge5myeDGFYIlKQGTZMiwfIyvv2iW2rLk01A== 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, T_SCC_BODY_TEXT_LINE=-0.01 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" From: Bernhard Beschow The only user of xen_set_pci_link_route() is xen_piix_pci_write_config_client() which implements PIIX-specific logic in the xen namespace. This makes xen-hvm depend on PIIX which could be avoided if xen_piix_pci_write_config_client() was implemented in PIIX. In order to do this, xen_set_pci_link_route() needs to be stubbable which this patch addresses. Signed-off-by: Bernhard Beschow Reviewed-by: Paul Durrant Message-Id: <20220626094656.15673-2-shentey@gmail.com> Signed-off-by: Laurent Vivier --- hw/i386/xen/xen-hvm.c | 7 ++++++- include/hw/xen/xen.h | 1 + include/hw/xen/xen_common.h | 6 ------ stubs/xen-hw-stub.c | 5 +++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 0731f7041069..204fda7949d9 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -161,11 +161,16 @@ void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len) } v &= 0xf; if (((address + i) >= PIIX_PIRQCA) && ((address + i) <= PIIX_PIRQCD)) { - xen_set_pci_link_route(xen_domid, address + i - PIIX_PIRQCA, v); + xen_set_pci_link_route(address + i - PIIX_PIRQCA, v); } } } +int xen_set_pci_link_route(uint8_t link, uint8_t irq) +{ + return xendevicemodel_set_pci_link_route(xen_dmod, xen_domid, link, irq); +} + int xen_is_pirq_msi(uint32_t msi_data) { /* If vector is 0, the msi is remapped into a pirq, passed as diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 0f9962b1c190..13bffaef531f 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -21,6 +21,7 @@ extern enum xen_mode xen_mode; extern bool xen_domid_restrict; int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num); +int xen_set_pci_link_route(uint8_t link, uint8_t irq); void xen_piix3_set_irq(void *opaque, int irq_num, int level); void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len); void xen_hvm_inject_msi(uint64_t addr, uint32_t data); diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 179741ff791c..77ce17d8a4f7 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -316,12 +316,6 @@ static inline int xen_set_pci_intx_level(domid_t domid, uint16_t segment, device, intx, level); } -static inline int xen_set_pci_link_route(domid_t domid, uint8_t link, - uint8_t irq) -{ - return xendevicemodel_set_pci_link_route(xen_dmod, domid, link, irq); -} - static inline int xen_inject_msi(domid_t domid, uint64_t msi_addr, uint32_t msi_data) { diff --git a/stubs/xen-hw-stub.c b/stubs/xen-hw-stub.c index 15f3921a76b0..743967623f00 100644 --- a/stubs/xen-hw-stub.c +++ b/stubs/xen-hw-stub.c @@ -23,6 +23,11 @@ void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len) { } +int xen_set_pci_link_route(uint8_t link, uint8_t irq) +{ + return -1; +} + void xen_hvm_inject_msi(uint64_t addr, uint32_t data) { } From patchwork Wed Jun 29 09:08:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12899621 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 0DFADC433EF for ; Wed, 29 Jun 2022 09:12:50 +0000 (UTC) Received: from localhost ([::1]:51012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6Tkf-0004ez-66 for qemu-devel@archiver.kernel.org; Wed, 29 Jun 2022 05:12:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6ThC-0000k4-Ny; Wed, 29 Jun 2022 05:09:21 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:60003) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6Th9-0003Z8-8Q; Wed, 29 Jun 2022 05:09:14 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MkIEJ-1nMjji15Ev-00kdGw; Wed, 29 Jun 2022 11:09:03 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Bernhard Beschow , "Michael S . Tsirkin" , Paul Durrant , Laurent Vivier Subject: [PULL 11/11] hw/i386/xen/xen-hvm: Inline xen_piix_pci_write_config_client() and remove it Date: Wed, 29 Jun 2022 11:08:49 +0200 Message-Id: <20220629090849.1350227-12-laurent@vivier.eu> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220629090849.1350227-1-laurent@vivier.eu> References: <20220629090849.1350227-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:qBv/7UjwxrbeNckl58IzS2rHwDjbiPxTtEFcB+M7dqM77+2Mkpk wM9kC20r6k7lkq/3A21YGRsnp5L5mFL30pQtFBsCvffQhXV9R5AAm5AgFskNK9kE9yy5s5M moG7/Q1H+P1oNSB2TFdMTmvtGv3TXB7iOQmsG1eiptSD+zz0gp897Xrf5kPAFkIV5TisL7W 6SqLQ5cy21B2RrH6DXEtw== X-UI-Out-Filterresults: notjunk:1;V03:K0:s5UxDHgrId0=:4aTgmPwCC8K+pzl/8C9Zuw e6qVFO9I/jtzX5beSvz6BZVUg/t06DDBjk9iVDgw1nPPAL4pXMIq1r+EFjRJzbzbsxUX3dCTg wTTSOcGp8GFox3rWaNfp0DBn2BxGF8ooYcC4ZPsesdayqvKm+6EAin+F/xkmsWeIgOarCMuf0 4Dr62daujhoylvH3WR8SHeNHX6dF9Q/D8BIVThNQk0bsGKLmXfQfFAUGbE+KCuZ//Oy6nje2c Px8ee4GR2jnSeTK3qSb1txiVe5dKhF2xmpheS7RRmvjsdMrzr6Lpv5gFx10mtHQZzH1aScBDZ RG3A1CExHrc7JSdddIUzWOA4r2Rg7Nr9l4V+y2oHwXSdA33UycIgULA9sV3tTn5eWgB3hxdEK BmBihsYJoWzxWLtRWYbOKSWbpt1aPenEZbRM2AbtqseYmWNPsaju/F0XxlKSyxsEger8IYRYc OjyWuQuJ+uP2fkfQ6zGqlsVRVd1dE1CbvldFciK2jhModavQ4ERaSEAjwFyM0cb+EbT/FJbCL ZURybfYFV2PzgujAzn75ngAGzLBPfWKFW/d8tn8kgRWtg9XRNQVfiArxHkDQEKuugdUnJxh7c rFHWtftKO8qMjGMlcTexITJfAnbEL+8HFiIpUH7lCZskVJxgEFsQRlX1Ft2ik7MfmTBltpOls 9+glxXzE63eDy6D31tyyo7EpTQ0Cluvc1sQ6lIO6RXhGZOeGZMNpIef1wHoZCe4nucW9MFQ9t RkolODep46ZwIhhT64ms5jk04Il0+BZdW+4P/g== 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, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" From: Bernhard Beschow xen_piix_pci_write_config_client() is implemented in the xen sub tree and uses PIIX constants internally, thus creating a direct dependency on PIIX. Now that xen_set_pci_link_route() is stubbable, the logic of xen_piix_pci_write_config_client() can be moved to PIIX which resolves the dependency. Signed-off-by: Bernhard Beschow Acked-by: Michael S. Tsirkin Reviewed-by: Paul Durrant Message-Id: <20220626094656.15673-3-shentey@gmail.com> Signed-off-by: Laurent Vivier --- hw/i386/xen/xen-hvm.c | 18 ------------------ hw/isa/piix3.c | 15 ++++++++++++++- include/hw/xen/xen.h | 1 - stubs/xen-hw-stub.c | 4 ---- 4 files changed, 14 insertions(+), 24 deletions(-) diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 204fda7949d9..e4293d6d666a 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -15,7 +15,6 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/i386/pc.h" -#include "hw/southbridge/piix.h" #include "hw/irq.h" #include "hw/hw.h" #include "hw/i386/apic-msidef.h" @@ -149,23 +148,6 @@ void xen_piix3_set_irq(void *opaque, int irq_num, int level) irq_num & 3, level); } -void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len) -{ - int i; - - /* Scan for updates to PCI link routes (0x60-0x63). */ - for (i = 0; i < len; i++) { - uint8_t v = (val >> (8 * i)) & 0xff; - if (v & 0x80) { - v = 0; - } - v &= 0xf; - if (((address + i) >= PIIX_PIRQCA) && ((address + i) <= PIIX_PIRQCD)) { - xen_set_pci_link_route(address + i - PIIX_PIRQCA, v); - } - } -} - int xen_set_pci_link_route(uint8_t link, uint8_t irq) { return xendevicemodel_set_pci_link_route(xen_dmod, xen_domid, link, irq); diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c index 6388558f92d4..48f9ab109645 100644 --- a/hw/isa/piix3.c +++ b/hw/isa/piix3.c @@ -138,7 +138,20 @@ static void piix3_write_config(PCIDevice *dev, static void piix3_write_config_xen(PCIDevice *dev, uint32_t address, uint32_t val, int len) { - xen_piix_pci_write_config_client(address, val, len); + int i; + + /* Scan for updates to PCI link routes (0x60-0x63). */ + for (i = 0; i < len; i++) { + uint8_t v = (val >> (8 * i)) & 0xff; + if (v & 0x80) { + v = 0; + } + v &= 0xf; + if (((address + i) >= PIIX_PIRQCA) && ((address + i) <= PIIX_PIRQCD)) { + xen_set_pci_link_route(address + i - PIIX_PIRQCA, v); + } + } + piix3_write_config(dev, address, val, len); } diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 13bffaef531f..afdf9c436afc 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -23,7 +23,6 @@ extern bool xen_domid_restrict; int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num); int xen_set_pci_link_route(uint8_t link, uint8_t irq); void xen_piix3_set_irq(void *opaque, int irq_num, int level); -void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len); void xen_hvm_inject_msi(uint64_t addr, uint32_t data); int xen_is_pirq_msi(uint32_t msi_data); diff --git a/stubs/xen-hw-stub.c b/stubs/xen-hw-stub.c index 743967623f00..34a22f2ad72e 100644 --- a/stubs/xen-hw-stub.c +++ b/stubs/xen-hw-stub.c @@ -19,10 +19,6 @@ void xen_piix3_set_irq(void *opaque, int irq_num, int level) { } -void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len) -{ -} - int xen_set_pci_link_route(uint8_t link, uint8_t irq) { return -1;