* [PULL 0/5] Trivial branch for 7.1 patches
@ 2022-08-04 19:22 Laurent Vivier
2022-08-04 19:22 ` [PULL 1/5] README.rst: fix link formatting Laurent Vivier
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Laurent Vivier @ 2022-08-04 19:22 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Laurent Vivier
The following changes since commit 2480f3bbd03814b0651a1f74959f5c6631ee5819:
Merge tag 'linux-user-for-7.1-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging (2022-08-03 08:32:44 -0700)
are available in the Git repository at:
https://gitlab.com/laurent_vivier/qemu.git tags/trivial-branch-for-7.1-pull-request
for you to fetch changes up to 21d4e557e2fd0cb7f10b632b35f51146a1b6d892:
include/qemu/host-utils.h: Simplify the compiler check in mulu128() (2022-08-04 13:49:47 +0200)
----------------------------------------------------------------
Pull request trivial branch 20220804
----------------------------------------------------------------
Cornelia Huck (1):
README.rst: fix link formatting
Eugenio Pérez (1):
vdpa: Fix file descriptor leak on get features error
Thomas Huth (2):
docs/about/removed-features: Move the -soundhw into the right section
include/qemu/host-utils.h: Simplify the compiler check in mulu128()
Yonggang Luo (1):
ppc: Remove redundant macro MSR_BOOK3S_MASK.
README.rst | 4 ++--
docs/about/removed-features.rst | 14 +++++++-------
include/qemu/host-utils.h | 3 +--
net/vhost-vdpa.c | 4 ++--
target/ppc/excp_helper.c | 1 -
5 files changed, 12 insertions(+), 14 deletions(-)
--
2.37.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PULL 1/5] README.rst: fix link formatting
2022-08-04 19:22 [PULL 0/5] Trivial branch for 7.1 patches Laurent Vivier
@ 2022-08-04 19:22 ` Laurent Vivier
2022-08-04 19:22 ` [PULL 2/5] vdpa: Fix file descriptor leak on get features error Laurent Vivier
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Laurent Vivier @ 2022-08-04 19:22 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Laurent Vivier, Cornelia Huck, Daniel P . Berrangé
From: Cornelia Huck <cohuck@redhat.com>
Make the links render correctly.
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220803090250.136556-1-cohuck@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
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
`<https://www.qemu.org/docs/master/>`_ is generated from the ``docs/``
folder in the source tree, and is built by `Sphinx
-<https://www.sphinx-doc.org/en/master/>_`.
+<https://www.sphinx-doc.org/en/master/>`_.
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
-<https://www.qemu.org/docs/master/devel/style.html>` of
+<https://www.qemu.org/docs/master/devel/style.html>`_ of
the Developers Guide.
Additional information on submitting patches can be found online via
--
2.37.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PULL 2/5] vdpa: Fix file descriptor leak on get features error
2022-08-04 19:22 [PULL 0/5] Trivial branch for 7.1 patches Laurent Vivier
2022-08-04 19:22 ` [PULL 1/5] README.rst: fix link formatting Laurent Vivier
@ 2022-08-04 19:22 ` Laurent Vivier
2022-08-04 19:22 ` [PULL 3/5] docs/about/removed-features: Move the -soundhw into the right section Laurent Vivier
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Laurent Vivier @ 2022-08-04 19:22 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Laurent Vivier, Eugenio Pérez, Laurent Vivier,
Michael S . Tsirkin
From: Eugenio Pérez <eperezma@redhat.com>
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 <eperezma@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20220802112447.249436-2-eperezma@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
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,
--
2.37.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PULL 3/5] docs/about/removed-features: Move the -soundhw into the right section
2022-08-04 19:22 [PULL 0/5] Trivial branch for 7.1 patches Laurent Vivier
2022-08-04 19:22 ` [PULL 1/5] README.rst: fix link formatting Laurent Vivier
2022-08-04 19:22 ` [PULL 2/5] vdpa: Fix file descriptor leak on get features error Laurent Vivier
@ 2022-08-04 19:22 ` Laurent Vivier
2022-08-04 19:22 ` [PULL 4/5] ppc: Remove redundant macro MSR_BOOK3S_MASK Laurent Vivier
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Laurent Vivier @ 2022-08-04 19:22 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Laurent Vivier, Thomas Huth,
Daniel P . Berrangé,
Christian Schoenebeck
From: Thomas Huth <thuth@redhat.com>
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 <thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Message-Id: <20220802075611.346835-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
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=<name>``.
+
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=<name>``.
-
TCG introspection features
--------------------------
--
2.37.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PULL 4/5] ppc: Remove redundant macro MSR_BOOK3S_MASK.
2022-08-04 19:22 [PULL 0/5] Trivial branch for 7.1 patches Laurent Vivier
` (2 preceding siblings ...)
2022-08-04 19:22 ` [PULL 3/5] docs/about/removed-features: Move the -soundhw into the right section Laurent Vivier
@ 2022-08-04 19:22 ` Laurent Vivier
2022-08-04 19:22 ` [PULL 5/5] include/qemu/host-utils.h: Simplify the compiler check in mulu128() Laurent Vivier
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Laurent Vivier @ 2022-08-04 19:22 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Laurent Vivier, Yonggang Luo, Daniel Henrique Barboza
From: Yonggang Luo <luoyonggang@gmail.com>
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20220728201135.223-1-luoyonggang@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
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)
{
--
2.37.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PULL 5/5] include/qemu/host-utils.h: Simplify the compiler check in mulu128()
2022-08-04 19:22 [PULL 0/5] Trivial branch for 7.1 patches Laurent Vivier
` (3 preceding siblings ...)
2022-08-04 19:22 ` [PULL 4/5] ppc: Remove redundant macro MSR_BOOK3S_MASK Laurent Vivier
@ 2022-08-04 19:22 ` Laurent Vivier
2022-08-05 2:01 ` [PULL 0/5] Trivial branch for 7.1 patches Richard Henderson
2022-08-05 5:52 ` Markus Armbruster
6 siblings, 0 replies; 8+ messages in thread
From: Laurent Vivier @ 2022-08-04 19:22 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Laurent Vivier, Thomas Huth, Richard Henderson
From: Thomas Huth <thuth@redhat.com>
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 <thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220721074809.1513357-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
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;
--
2.37.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PULL 0/5] Trivial branch for 7.1 patches
2022-08-04 19:22 [PULL 0/5] Trivial branch for 7.1 patches Laurent Vivier
` (4 preceding siblings ...)
2022-08-04 19:22 ` [PULL 5/5] include/qemu/host-utils.h: Simplify the compiler check in mulu128() Laurent Vivier
@ 2022-08-05 2:01 ` Richard Henderson
2022-08-05 5:52 ` Markus Armbruster
6 siblings, 0 replies; 8+ messages in thread
From: Richard Henderson @ 2022-08-05 2:01 UTC (permalink / raw)
To: Laurent Vivier, qemu-devel; +Cc: qemu-trivial
On 8/4/22 12:22, Laurent Vivier wrote:
> The following changes since commit 2480f3bbd03814b0651a1f74959f5c6631ee5819:
>
> Merge tag 'linux-user-for-7.1-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging (2022-08-03 08:32:44 -0700)
>
> are available in the Git repository at:
>
> https://gitlab.com/laurent_vivier/qemu.git tags/trivial-branch-for-7.1-pull-request
>
> for you to fetch changes up to 21d4e557e2fd0cb7f10b632b35f51146a1b6d892:
>
> include/qemu/host-utils.h: Simplify the compiler check in mulu128() (2022-08-04 13:49:47 +0200)
>
> ----------------------------------------------------------------
> Pull request trivial branch 20220804
Applied, thanks. Please update https://wiki.qemu.org/ChangeLog/7.1 as appropriate.
r~
>
> ----------------------------------------------------------------
>
> Cornelia Huck (1):
> README.rst: fix link formatting
>
> Eugenio Pérez (1):
> vdpa: Fix file descriptor leak on get features error
>
> Thomas Huth (2):
> docs/about/removed-features: Move the -soundhw into the right section
> include/qemu/host-utils.h: Simplify the compiler check in mulu128()
>
> Yonggang Luo (1):
> ppc: Remove redundant macro MSR_BOOK3S_MASK.
>
> README.rst | 4 ++--
> docs/about/removed-features.rst | 14 +++++++-------
> include/qemu/host-utils.h | 3 +--
> net/vhost-vdpa.c | 4 ++--
> target/ppc/excp_helper.c | 1 -
> 5 files changed, 12 insertions(+), 14 deletions(-)
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PULL 0/5] Trivial branch for 7.1 patches
2022-08-04 19:22 [PULL 0/5] Trivial branch for 7.1 patches Laurent Vivier
` (5 preceding siblings ...)
2022-08-05 2:01 ` [PULL 0/5] Trivial branch for 7.1 patches Richard Henderson
@ 2022-08-05 5:52 ` Markus Armbruster
6 siblings, 0 replies; 8+ messages in thread
From: Markus Armbruster @ 2022-08-05 5:52 UTC (permalink / raw)
To: Laurent Vivier; +Cc: qemu-devel, qemu-trivial
I was hoping for "[PATCH] contrib/vhost-user-blk: Clean up deallocation
of VuVirtqElement".
https://patchew.org/QEMU/20220630085219.1305519-1-armbru@redhat.com/
Next time, perhaps?
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-08-05 5:54 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-04 19:22 [PULL 0/5] Trivial branch for 7.1 patches Laurent Vivier
2022-08-04 19:22 ` [PULL 1/5] README.rst: fix link formatting Laurent Vivier
2022-08-04 19:22 ` [PULL 2/5] vdpa: Fix file descriptor leak on get features error Laurent Vivier
2022-08-04 19:22 ` [PULL 3/5] docs/about/removed-features: Move the -soundhw into the right section Laurent Vivier
2022-08-04 19:22 ` [PULL 4/5] ppc: Remove redundant macro MSR_BOOK3S_MASK Laurent Vivier
2022-08-04 19:22 ` [PULL 5/5] include/qemu/host-utils.h: Simplify the compiler check in mulu128() Laurent Vivier
2022-08-05 2:01 ` [PULL 0/5] Trivial branch for 7.1 patches Richard Henderson
2022-08-05 5:52 ` Markus Armbruster
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.