From 9567fc1665b6649d2aff0184f68377a9e7c30dd9 Mon Sep 17 00:00:00 2001 From: Cornelia Huck Date: Wed, 3 Aug 2022 11:02:50 +0200 Subject: [PATCH 1/5] README.rst: fix link formatting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 23795b8377..21df79ef43 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 aed5da45daf734ddc543c0791e877dac75e16f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Tue, 2 Aug 2022 13:24:46 +0200 Subject: [PATCH 2/5] vdpa: Fix file descriptor leak on get features error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 6abad276a6..303447a68e 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 9878fbf3424015da93e0a8e8cec40a2d45323fad Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Tue, 2 Aug 2022 09:56:11 +0200 Subject: [PATCH 3/5] docs/about/removed-features: Move the -soundhw into the right section MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 c7b9dadd5d..925e22016f 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 1e2dd311491565a58b30f29e71c6e429fc8e7e84 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Fri, 29 Jul 2022 04:11:35 +0800 Subject: [PATCH 4/5] ppc: Remove redundant macro MSR_BOOK3S_MASK. 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 cb752b184a..7550aafed6 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 21d4e557e2fd0cb7f10b632b35f51146a1b6d892 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 21 Jul 2022 09:48:09 +0200 Subject: [PATCH 5/5] include/qemu/host-utils.h: Simplify the compiler check in mulu128() 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 29f3a99878..88d476161c 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;