From patchwork Thu Aug 4 19:22:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12936632 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 18698C19F21 for ; Thu, 4 Aug 2022 19:32:05 +0000 (UTC) Received: from localhost ([::1]:59058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJgZg-0000wl-O7 for qemu-devel@archiver.kernel.org; Thu, 04 Aug 2022 15:32:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJgQZ-0006UH-QO; Thu, 04 Aug 2022 15:22:40 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:57981) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJgQJ-0002iE-B0; Thu, 04 Aug 2022 15:22:39 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MhULz-1nppmr20qB-00eai2; Thu, 04 Aug 2022 21:22:18 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Laurent Vivier , Cornelia Huck , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Subject: [PULL 1/5] README.rst: fix link formatting Date: Thu, 4 Aug 2022 21:22:12 +0200 Message-Id: <20220804192216.1958922-2-laurent@vivier.eu> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220804192216.1958922-1-laurent@vivier.eu> References: <20220804192216.1958922-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:hpDY0PSgfw/G9x95zyzQtAUkmrxRSENPt5WYREAuQQDqI5y+54M 9zRKMxEt2R88Vn5Na1HRIdvVMLwBfV7fDcjU7DjDpAz5NXk3lfNyXBYcElB/2Un4+iudA/S 1/pB6U+6v5yfI6ern2iMMrF1V5iuhQVTPWlcDUOitEyCGQxi6y8nvLGSR5WOojplNL1oISg 2ONfZJQCf6KcYoXW7Tg4A== X-UI-Out-Filterresults: notjunk:1;V03:K0:AeuhumDlzJc=:orVx78OHAOSVNLnaNvB1Cx us9BpWCc/3YmXbiPFFMnYYnXrviWASPFaU3a3YnP0CM4/E0TE1mg4yiFNv5gBqEBwmZrysn+1 RwGZfwqgM9202dhvrRtaKN6TkO1aCvXoFtT/BzJJIVEKwr6uaV/XpThElEwY9IEoFc066/i8l iPWcSTRuk/dJGRq2qNGMHseyenUhs95Z5xDv0nGzJ4UeLTQ83xkZOsjUUEWz/ancZIynoNW5j 6XL4QVQ7bhuo7o/p7lR6vBakghwXc/aXHPs+b7W3Ax7sgHQqlnI2ARpRv8Cp/6CnTbGYdpFMs weBxHVBxdIgdutXqjvGRxMKR9ueAHlgcEyQ7wOgH4vmweqQsqiGDsiMPR/zi+Oxznj44v4gxN XAVc6KT2/06g5pR6+zFs+lM0qJ/O/7RNFaC0HQwdL44RzdgkMCiYcni8+e6xq6FrgUm/tlRFM oKdCSfO+O8t+GlD86WcmZWjtrpWcErOCzLpq7HhfNECTdTUiD3tC/w9zCGcR1QpwwcJMd60zo HV9G1R1wnpJBLdd2bGC6L/p8arXXHLS6Cn9ktDFbZDGbod8099v4fgLp7Zv9YJTkoza4RxdQ9 6wmYI+QQrdyQa1+LMvX9xDRPvHvqHvbkPVY3E6LgaIA+qwIM4F9JoeiygPaGQqtKs7QqaoBB1 bi1CHSgh4JlfMB1KwN4E8jlLwDtU2eMpatHfbXTFTiD7YBuw/GhZtxCM25ZdTbNUgcdOmH9F6 tCpgBN4VEHWZQERvlj3QjF6bpZ/Gk478ARkXyw== Received-SPF: none client-ip=212.227.126.131; 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_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=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: Cornelia Huck Make the links render correctly. Signed-off-by: Cornelia Huck Reviewed-by: Daniel P. Berrangé Message-Id: <20220803090250.136556-1-cohuck@redhat.com> Signed-off-by: Laurent Vivier --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 23795b837740..21df79ef4379 100644 --- a/README.rst +++ b/README.rst @@ -39,7 +39,7 @@ Documentation can be found hosted online at current development version that is available at ``_ is generated from the ``docs/`` folder in the source tree, and is built by `Sphinx -_`. +`_. Building @@ -78,7 +78,7 @@ format-patch' and/or 'git send-email' to format & send the mail to the qemu-devel@nongnu.org mailing list. All patches submitted must contain a 'Signed-off-by' line from the author. Patches should follow the guidelines set out in the `style section -` of +`_ of the Developers Guide. Additional information on submitting patches can be found online via From patchwork Thu Aug 4 19:22:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12936625 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 95D3DC19F21 for ; Thu, 4 Aug 2022 19:25:12 +0000 (UTC) Received: from localhost ([::1]:45152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJgT1-0001AL-Gu for qemu-devel@archiver.kernel.org; Thu, 04 Aug 2022 15:25:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJgQZ-0006UI-Qn; Thu, 04 Aug 2022 15:22:40 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:58589) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJgQJ-0002iJ-FI; Thu, 04 Aug 2022 15:22:39 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M9nhF-1oNEnW0KJh-005nrA; Thu, 04 Aug 2022 21:22:19 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Laurent Vivier , =?utf-8?q?E?= =?utf-8?q?ugenio_P=C3=A9rez?= , Laurent Vivier , "Michael S . Tsirkin" Subject: [PULL 2/5] vdpa: Fix file descriptor leak on get features error Date: Thu, 4 Aug 2022 21:22:13 +0200 Message-Id: <20220804192216.1958922-3-laurent@vivier.eu> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220804192216.1958922-1-laurent@vivier.eu> References: <20220804192216.1958922-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:PlZEuQe6wSNNL5X/r8CICuAdM952zMYMC/hWWDjDoXTNU6HwTGh d68/QkLvYlRWn/C3cC/tugAScBcTmgmMOuNGD2E5BJEFOzVBYFdfeCjTcVqm8cEKzN+k0hL N4Q+y2zZgx0qKxsaqlBky0Di8COR9aK9vPudHo8Da5nwaJ3qs4BOjzzVT7gzUsPI1wSkvsn 3S7OX3M2l/DIRt2XCIm4g== X-UI-Out-Filterresults: notjunk:1;V03:K0:X4j78tE9pa8=:13U/IYdnftaUiecrIzzeVA prZCs9NRtA0KVfEcRPY0mRmauACCqKjjaEWF4SkDR4cgLCXscwWOtXQKMfyEz3l+3q78/wp9x 4U6JHxdKfzFy0Jh0fMSF5Uuy+49rO3kIdM78SKsBTMUPrKsk2W1eMEWYuim0AVk9wtE0/1G5y 12NbjlMFxq6ZAZ8cpZ8nNsGHZkhkEvZ+FXqsvX0yIci6fK2q3j5kjDT1BhkLk7zKxW1tTJdj1 HBXs7HIo4cQalR2+aRwqVBiwWhmM5BeOAKmEWJXUd6KxNAW8sDlsF2gHND6nHIUVW48ixI2Vh hcl1AsEUmaDnnX40i458ahJj+zGUF4iwWd0SvOZOjIJAjBwLdt09U0lasEm84eAqzEiOSFMKc vN9o9dzlyRzC80zLc+C9xBDfh4lP1Km778rPp597WS2Z+Pc8GiKn+i2YX6UsffnAL5FCb6YRU yJlIF2y6nNnyqY4NvkzMKLGBuPjuMGShuK0BIWghUewR2VuFvtjLDuGY0puw3z28F+aB3SEgL zm4V5wpXRxs1LsHQQHfmAnzmAWTFZaXj6Q+6s6Fb8rg7nTcIwv9BnGfIuroWRSZuOHaPDwFx0 uCknciSGswIZawweMcnjWbWnKG7qP804yIU24rbsH79k0W2HxKSIN/k8G6aAd74TI4voW2cvl 2goqZMZu6v6XTxRxSjbtVvOOtdQ5ZXEpH2c7AS9kGq8IavPEYzo7t+tGmm3kOIVkmFEqkw5si nkorMlyqWOP6w39EYm6rill+JXneL7+kfcnKpA== Received-SPF: none client-ip=212.227.126.133; 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_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=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 File descriptor vdpa_device_fd is not free in the case of returning error from vhost_vdpa_get_features. Fixing it by making all errors go to the same error path. Resolves: Coverity CID 1490785 Fixes: 8170ab3f43 ("vdpa: Extract get features part from vhost_vdpa_get_max_queue_pairs") Signed-off-by: Eugenio Pérez Reviewed-by: Laurent Vivier Reviewed-by: Michael S. Tsirkin Message-Id: <20220802112447.249436-2-eperezma@redhat.com> Signed-off-by: Laurent Vivier --- net/vhost-vdpa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 6abad276a61a..303447a68e8b 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -566,7 +566,7 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name, g_autofree NetClientState **ncs = NULL; g_autoptr(VhostIOVATree) iova_tree = NULL; NetClientState *nc; - int queue_pairs, r, i, has_cvq = 0; + int queue_pairs, r, i = 0, has_cvq = 0; assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA); opts = &netdev->u.vhost_vdpa; @@ -582,7 +582,7 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name, r = vhost_vdpa_get_features(vdpa_device_fd, &features, errp); if (unlikely(r < 0)) { - return r; + goto err; } queue_pairs = vhost_vdpa_get_max_queue_pairs(vdpa_device_fd, features, From patchwork Thu Aug 4 19:22:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12936623 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 7D79FC19F21 for ; Thu, 4 Aug 2022 19:24:55 +0000 (UTC) Received: from localhost ([::1]:44346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJgSk-0000cZ-7M for qemu-devel@archiver.kernel.org; Thu, 04 Aug 2022 15:24:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJgQP-0006R6-Ro; Thu, 04 Aug 2022 15:22:29 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:57051) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJgQK-0002iT-A2; Thu, 04 Aug 2022 15:22:29 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M6lYs-1oLIzF33Xi-008GYx; Thu, 04 Aug 2022 21:22:19 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Laurent Vivier , Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Christian Schoenebeck Subject: [PULL 3/5] docs/about/removed-features: Move the -soundhw into the right section Date: Thu, 4 Aug 2022 21:22:14 +0200 Message-Id: <20220804192216.1958922-4-laurent@vivier.eu> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220804192216.1958922-1-laurent@vivier.eu> References: <20220804192216.1958922-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:luPvrACtIbj4IbMrkXlqYNiy5vKf3lwkofsHIWpn8mxUj3hrlRC Dzo2XA5tXnjhXe6vvbP52yllcmQBoWRx+0zYXwguYBIlh2HBgCvtdiyCFiEm6o7+dU7ePUB +t9fcaaF5+FHV7LC4WFiQIP57j6SahY9Vyp7k28+3kZL135ykb8A0yVK/YCpWu7N+T/N9Ae MHwCeER/npt/FGvrcvDmw== X-UI-Out-Filterresults: notjunk:1;V03:K0:ukKcctbwkBE=:QQlKjrJ5kKRvQpjjU+SYYu TwLrO0dpNr23T3SDFLqCaLbPC9ENW/1wSlfEcHtpKxOTuQdFhdFaozn9Tfe9BNUVNAN98vRJK U4fTvl4nxg8YJcTwRGOrI2x4YMuAeWxyP59++CiO7a8gtP6Tof5f74aHbM/i+maMHprxSdKxN Ue94w94JvVoipmVslEFU2E1cL/ODAA6M9StQMkGPqjnSU8gQ7q67/Z2UYu+egn2gkhefj3xob 6dgqg3to2p3ziBuYVKqhWeKFQfTeE0kpiwKQxzvqe1LGg2TECAyrGZf9dHW9odCabg2Kfkvt7 2ApzRywFl0cbT6jxYsvlcTF62YVQGAM52gF0sg08dVhaQJQ4rKiy7yfAMzDyYRoJZ2Ne0qQLP bVE0iafZvMpJWfIQ0Kn5rKEh2bQ/l6p+OzqmRouN9FVHTkmTQxy62DNb7UqGyiItBcQrOVulw 3d2jYzRV+v6ZlahyoSWzbx7OkJMlzc64VWThtFl5n9h6OkRto2OaJnloGxuhnNEax0KAPr81w +WOrKl31MV5D1XyIThGJosjDImdoe9RnRbpkFJtp4/2W8yjBnndN12EpHBA1+lRQ/RMGDBbDe xD/FsuypXdt5QvV8FzRDTAbXUatALjnjYNN46Zdo1uehYXfcHLNPcWxfIGZbThKCmWMOAFv4l nda4o5Eewxt+2mbAIku5mB24y2uj15IsF7mFYmn/oZY3y+F5xsvPcDMdyfgNY+7cKHSUXhoX/ YdqvR1uBB8Q/yPNqqd6p20UIyhwfrwFHodq3og== Received-SPF: none client-ip=212.227.126.131; 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: Thomas Huth The note about the removal of '-soundhw' has been accidentally added to the section of removed "linux-user mode CPUs" ... it should reside in the section about removed "System emulator command line arguments" instead. Fixes: 039a68373c ("introduce -audio as a replacement for -soundhw") Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrangé Reviewed-by: Christian Schoenebeck Message-Id: <20220802075611.346835-1-thuth@redhat.com> Signed-off-by: Laurent Vivier --- docs/about/removed-features.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index c7b9dadd5d63..925e22016f98 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -396,6 +396,13 @@ Use ``-display sdl`` instead. Use ``-display curses`` instead. +Creating sound card devices using ``-soundhw`` (removed in 7.1) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Sound card devices should be created using ``-device`` or ``-audio``. +The exception is ``pcspk`` which can be activated using ``-machine +pcspk-audiodev=``. + QEMU Machine Protocol (QMP) commands ------------------------------------ @@ -681,13 +688,6 @@ tripped up the CI testing and was suspected to be quite broken. For that reason the maintainers strongly suspected no one actually used it. -Creating sound card devices using ``-soundhw`` (removed in 7.1) -''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -Sound card devices should be created using ``-device`` or ``-audio``. -The exception is ``pcspk`` which can be activated using ``-machine -pcspk-audiodev=``. - TCG introspection features -------------------------- From patchwork Thu Aug 4 19:22:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12936631 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 DABECC25B06 for ; Thu, 4 Aug 2022 19:28:05 +0000 (UTC) Received: from localhost ([::1]:52412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJgVo-0005aA-U6 for qemu-devel@archiver.kernel.org; Thu, 04 Aug 2022 15:28:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJgQZ-0006UG-QP; Thu, 04 Aug 2022 15:22:40 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:57921) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJgQJ-0002iB-Bb; Thu, 04 Aug 2022 15:22:39 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N5mWp-1nNKXH1B3T-017Hd4; Thu, 04 Aug 2022 21:22:20 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Laurent Vivier , Yonggang Luo , Daniel Henrique Barboza Subject: [PULL 4/5] ppc: Remove redundant macro MSR_BOOK3S_MASK. Date: Thu, 4 Aug 2022 21:22:15 +0200 Message-Id: <20220804192216.1958922-5-laurent@vivier.eu> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220804192216.1958922-1-laurent@vivier.eu> References: <20220804192216.1958922-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:wujUiv6wx74tv6MS1YU4pSik11YX8b8zNpa5zzyrB/mNBDXv5R3 /zdXg+OEPFfp8s8PmqFlEJYh0HiRMtimXy9wRb+lBsMA1SxWm3Xlz8scrE5/b6y3LefyOYg cRyxpa+Kk6vkzcKN78w02JhrDXsYpZ74krko3c7tiFoK/46YzdBMj151H74YElr6oZFNUqn q22lRwQ02817Etx1yF8Ng== X-UI-Out-Filterresults: notjunk:1;V03:K0:9g4ntCPcTsM=:MZNC/yrLPYLwmHa+VVpqHO X5dY7GzgWrUx7BFN9f1hb1a9dvD0qmvVEnP160Vlht5Lf7OKhgAtT3IjxgosL1OvRIxPnHE20 YUvma3w890YcFxTLmRYluNBu4GLM5EKsrJfEENiPiqBliz6+qsc1I+hSyqWgzA4t1nLko0Lqo ex2VZZvsLCmiB8UoiRo7HpTBvugZq6eHPwKEbs8JXnXKEeNkSOF9L80eEJ70P6z1oNw/z8fvG MeCTbVgETTnEpj+yVFyN1LHJS5QcE6VBY1ibcHH8mvhisIZX44XEnADC48ALKxJ2UWbKRZD/K fLAWXaCLm4dUskZfouGlmAL3N/50+ik5RZlTaDPU/FQgArHXQbSdxKZS3YRf4oGcp5ZGnIAfJ bFK/jmMWZajOyf/JbFuNLrDS3TMjZrwn9GLwDAG9ZopCkschA0Yw8bo3PPP2RiXQjQGOXHGYy hrl4I5VeKaWxkE+gXD8y3IQwyGiOPfF5KT0joTfmAAqukKKRzxrD64Pcw1blKBNLaDF7eAJPt hTmfP6LAq7CgjV1flFvCArIKcPxer61uJP3tytHCvOVK9LaUeYmxxAbUaPJ8Of/r25T26TJpg PJtPNBUqVLUEHR7Rz0yrOy0WFuejYSLVwCupNq6BIocVANyrv81mFJYHnif6q0ztzZ9S2VkAm chWcUgVc73X0rqAhxc/A1G+CcOeoISWpdwadDw58eQibvvBZWLM7s2voI1Xi/jl9Elr7hlvAo cXONGvNZNGKPelyAU9QKP5rXTXHBQAjjkYYAuw== Received-SPF: none client-ip=212.227.126.130; 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_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=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: Yonggang Luo Signed-off-by: Yonggang Luo Reviewed-by: Daniel Henrique Barboza Message-Id: <20220728201135.223-1-luoyonggang@gmail.com> Signed-off-by: Laurent Vivier --- target/ppc/excp_helper.c | 1 - 1 file changed, 1 deletion(-) diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index cb752b184a0a..7550aafed660 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -2015,7 +2015,6 @@ void helper_rfi(CPUPPCState *env) do_rfi(env, env->spr[SPR_SRR0], env->spr[SPR_SRR1] & 0xfffffffful); } -#define MSR_BOOK3S_MASK #if defined(TARGET_PPC64) void helper_rfid(CPUPPCState *env) { From patchwork Thu Aug 4 19:22:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12936624 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 A5AF4C19F21 for ; Thu, 4 Aug 2022 19:25:08 +0000 (UTC) Received: from localhost ([::1]:44924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJgSx-00010d-O7 for qemu-devel@archiver.kernel.org; Thu, 04 Aug 2022 15:25:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJgQR-0006RK-8s; Thu, 04 Aug 2022 15:22:31 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:37771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJgQM-0002if-7A; Thu, 04 Aug 2022 15:22:31 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MPGBR-1o3UzB3UnV-00Pf5Y; Thu, 04 Aug 2022 21:22:21 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Laurent Vivier , Thomas Huth , Richard Henderson Subject: [PULL 5/5] include/qemu/host-utils.h: Simplify the compiler check in mulu128() Date: Thu, 4 Aug 2022 21:22:16 +0200 Message-Id: <20220804192216.1958922-6-laurent@vivier.eu> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220804192216.1958922-1-laurent@vivier.eu> References: <20220804192216.1958922-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:fToQe7giDyBb7KJ3ybR2y5r5tcTHRf7O5dM1W+g4EV+AJ3qwwDg 7HWiBTTCCsUWlSjIxoWW14fPIXXLFSKOw7CdhnZ8jeLvhR30FKUwq6EThpXrtImSMT2+i+L wwEpXJYTudxKHPRWpDZzLyxGdXYrVSMK72Yz+lZ+hDAT0DM2Avn9PdVrgF0mhksw/+8Fkgg n2MBXjN9LioFOBRCdM/cQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:VRh3Kr4llsE=:V1XJNVRNCn9rbz1vi3EgvC KIPq63KUuzeJUliqJxI0HrPN9cjvXqduRi/2Y3xcIPQ0oDyXHzZVk1mvegOA9aRfFdnAUs7zU G9BgGImujdmjkZb+Jme/DFXN2SwRK5tqN6Dszpi740TwR41EOL66IxmIlsJMT2aZ4akjmWwCf 8v+txTL6mdq5u46PFBDy1P1M7vDg6gfdglVTmBg0wzfS+tESbhz0ujwill132tYJqVWp1jPrL 0ETyiWxwefmkU2e0vV8MUleouSsxZ8E/ACKoOuu9aY5ASeHDyiiE7Tfwt1Hu2TgTPuYZjoxXc JS9aEra1Wb9i4zJ19l6HROqzM6bDvcgaKBxin2+DVfUNe9B28Efd32AHM6HVVVo+z/t0zY00i 9VITZuB+D4nLM0q7gCd8SHpT9EGgySzhoZYgJzKYEPPyHfQ8kUuuAnMurPIwvWXPi6BdL0I6X BU+IUsIhCcbx/RtgmZ3yjOzK7YcsdAtTQWxmi4gHzW3xeSSwFdjff5aIe83QTNhHh5tFxsBhI RSAdO2GBId8I2Lj7F3J04iPZDjG9YqX+BwQzFYWXhOLkuV+IBgtabm8BbbtPLVDLi2BlTK6E0 IWgoiFydf07fDhZuGRZ6CrDd7REf/ExIwphbOx9GsPqDaQ8AfzEhh7v6GIl+LJ7GV8RPCUpdX HHIJbdEXM4oEAfkRhRKWtUp86Ea7P0WmM/1hyhtuDCpNkKSY0hcmHn+/tS2lIdLJLRdxV/vA8 96dDDfjz0azJVkDB4xETAeOvRF1fC+aswhshGw== Received-SPF: none client-ip=212.227.126.135; 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: Thomas Huth We currently require at least GCC 7.4 or Clang 6.0 for compiling QEMU. GCC has __builtin_mul_overflow since version 5 already, and Clang 6.0 also provides this built-in function (see its documentation on this page: https://releases.llvm.org/6.0.0/tools/clang/docs/LanguageExtensions.html ). So we can simplify the #if statement here. Signed-off-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20220721074809.1513357-1-thuth@redhat.com> Signed-off-by: Laurent Vivier --- include/qemu/host-utils.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/qemu/host-utils.h b/include/qemu/host-utils.h index 29f3a9987880..88d476161ccb 100644 --- a/include/qemu/host-utils.h +++ b/include/qemu/host-utils.h @@ -533,8 +533,7 @@ static inline bool umul64_overflow(uint64_t x, uint64_t y, uint64_t *ret) */ static inline bool mulu128(uint64_t *plow, uint64_t *phigh, uint64_t factor) { -#if defined(CONFIG_INT128) && \ - (__has_builtin(__builtin_mul_overflow) || __GNUC__ >= 5) +#if defined(CONFIG_INT128) bool res; __uint128_t r; __uint128_t f = ((__uint128_t)*phigh << 64) | *plow;