[PULL v2 0/9] Trivial patches for 2024-04-29

[PULL v2 0/9] Trivial patches for 2024-04-29

[Michael Tokarev]

The following changes since commit fd87be1dada5672f877e03c2ca8504458292c479:

  Merge tag 'accel-20240426' of https://github.com/philmd/qemu into staging (2024-04-26 15:28:13 -0700)

are available in the Git repository at:

  https://gitlab.com/mjt0k/qemu.git tags/pull-trivial-patches

for you to fetch changes up to ce1992d45c875c29a9018b7ac2fa9bad6587c711:

  checkpatch.pl: forbid strerrorname_np() (2024-04-29 15:26:56 +0300)

----------------------------------------------------------------
trivial patches for 2024-04-29

v2: fix author of "backends/cryptodev-builtin: Fix local_error leaks"
(which should be catched now by checkpatch.pl additions in this series)
Only patch 6 is being resent.
----------------------------------------------------------------
Daniel Henrique Barboza (2):
      target/riscv/kvm: remove sneaky strerrorname_np() instance
      checkpatch.pl: forbid strerrorname_np()

Li Zhijian (1):
      backends/cryptodev-builtin: Fix local_error leaks

Michael Tokarev (1):
      target/loongarch/cpu.c: typo fix: expection

Philippe Mathieu-Daudé (2):
      scripts/checkpatch: Avoid author email mangled by qemu-*@nongnu.org
      scripts/checkpatch: Do not use mailmap

Thomas Huth (3):
      target/i386/cpu: Remove "x86" prefix from the CPU list
      target/s390x/cpu_models: Rework the output of "-cpu help"
      target/ppc/cpu_init: Remove "PowerPC" prefix from the CPU list

 backends/cryptodev-builtin.c |  9 +++++----
 scripts/checkpatch.pl        | 11 +++++++----
 target/i386/cpu.c            |  2 +-
 target/loongarch/cpu.c       |  2 +-
 target/ppc/cpu_init.c        |  9 +++++----
 target/riscv/kvm/kvm-cpu.c   |  4 ++--
 target/s390x/cpu_models.c    |  9 +++++----
 7 files changed, 26 insertions(+), 20 deletions(-)

[PULL v2 6/9] backends/cryptodev-builtin: Fix local_error leaks

[Michael Tokarev]

From: Li Zhijian <lizhijian@fujitsu.com>

It seems that this error does not need to be propagated to the upper,
directly output the error to avoid the leaks

Closes: https://gitlab.com/qemu-project/qemu/-/issues/2283
Fixes: 2fda101de07 ("virtio-crypto: Support asynchronous mode")
Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: zhenwei pi <pizhenwei@bytedance.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 backends/cryptodev-builtin.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/backends/cryptodev-builtin.c b/backends/cryptodev-builtin.c
index a514bbb310..940104ee55 100644
--- a/backends/cryptodev-builtin.c
+++ b/backends/cryptodev-builtin.c
@@ -23,6 +23,7 @@
 
 #include "qemu/osdep.h"
 #include "sysemu/cryptodev.h"
+#include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "standard-headers/linux/virtio_crypto.h"
 #include "crypto/cipher.h"
@@ -396,8 +397,8 @@ static int cryptodev_builtin_create_session(
     case VIRTIO_CRYPTO_HASH_CREATE_SESSION:
     case VIRTIO_CRYPTO_MAC_CREATE_SESSION:
     default:
-        error_setg(&local_error, "Unsupported opcode :%" PRIu32 "",
-                   sess_info->op_code);
+        error_report("Unsupported opcode :%" PRIu32 "",
+                     sess_info->op_code);
         return -VIRTIO_CRYPTO_NOTSUPP;
     }
 
@@ -554,8 +555,8 @@ static int cryptodev_builtin_operation(
 
     if (op_info->session_id >= MAX_NUM_SESSIONS ||
               builtin->sessions[op_info->session_id] == NULL) {
-        error_setg(&local_error, "Cannot find a valid session id: %" PRIu64 "",
-                   op_info->session_id);
+        error_report("Cannot find a valid session id: %" PRIu64 "",
+                     op_info->session_id);
         return -VIRTIO_CRYPTO_INVSESS;
     }
 
-- 
2.39.2

Re: [PULL v2 0/9] Trivial patches for 2024-04-29

[Richard Henderson]

On 4/29/24 05:31, Michael Tokarev wrote:
> The following changes since commit fd87be1dada5672f877e03c2ca8504458292c479:
> 
>    Merge tag 'accel-20240426' ofhttps://github.com/philmd/qemu  into staging (2024-04-26 15:28:13 -0700)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/mjt0k/qemu.git  tags/pull-trivial-patches
> 
> for you to fetch changes up to ce1992d45c875c29a9018b7ac2fa9bad6587c711:
> 
>    checkpatch.pl: forbid strerrorname_np() (2024-04-29 15:26:56 +0300)
> 
> ----------------------------------------------------------------
> trivial patches for 2024-04-29
> 
> v2: fix author of "backends/cryptodev-builtin: Fix local_error leaks"
> (which should be catched now by checkpatch.pl additions in this series)
> Only patch 6 is being resent.

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/9.1 as appropriate.


r~