diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-04-29 17:18:35 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-04-29 17:18:35 -0700 |
| commit | 2358f1b60f73287fe606c7ff48043b4f9e1c2d0f (patch) | |
| tree | 5c0a9cdffb15ac1948a7b7c374e13f638aea48d7 /backends/cryptodev-builtin.c | |
| parent | 5fee33d97a7f2e95716417bd164f2f5264acd976 (diff) | |
| parent | ce1992d45c875c29a9018b7ac2fa9bad6587c711 (diff) | |
| download | focaccia-qemu-2358f1b60f73287fe606c7ff48043b4f9e1c2d0f.tar.gz focaccia-qemu-2358f1b60f73287fe606c7ff48043b4f9e1c2d0f.zip | |
Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging
trivial patches for 2024-04-29 # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCAAdFiEEe3O61ovnosKJMUsicBtPaxppPlkFAmYvknIACgkQcBtPaxpp # Pln8ywf+LthaeFDBccSYDKE+bu0zGshog5wBvlD6PHH7+e/tL6y5rKBmoC8aa2Pv # 9Op57otEGAjOviLwFh+Xm78B6SwTweFwDlRsLDhzZUyVWMV6RqfPQ2Ix2rTGncCZ # t7hpHwnDqtHPkwqqEdXzNC6tlL5wjTlZLOK8osCpUz7Ji4Iqt79KaxGiuEjdHovb # DBTOzC1DbfmCEWf7UcoBFsoQLHhYwnasAC+obEGD2ahiIfetyqOwaS0QrpWiw/47 # fl4sfuFgI2n56AdEtD7PNDiHZaCJ7ZnvlAz4wXu4veqdefgKNi2vlBXKNc0DokNK # pHaBsEnFswjVsz5w2ynQRH+i3hMzWg== # =rRV+ # -----END PGP SIGNATURE----- # gpg: Signature made Mon 29 Apr 2024 05:28:34 AM PDT # gpg: using RSA key 7B73BAD68BE7A2C289314B22701B4F6B1A693E59 # gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" [full] # gpg: aka "Michael Tokarev <mjt@debian.org>" [full] # gpg: aka "Michael Tokarev <mjt@corpit.ru>" [full] * tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu: checkpatch.pl: forbid strerrorname_np() target/riscv/kvm: remove sneaky strerrorname_np() instance target/loongarch/cpu.c: typo fix: expection backends/cryptodev-builtin: Fix local_error leaks scripts/checkpatch: Do not use mailmap scripts/checkpatch: Avoid author email mangled by qemu-*@nongnu.org target/ppc/cpu_init: Remove "PowerPC" prefix from the CPU list target/s390x/cpu_models: Rework the output of "-cpu help" target/i386/cpu: Remove "x86" prefix from the CPU list Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'backends/cryptodev-builtin.c')
| -rw-r--r-- | backends/cryptodev-builtin.c | 9 |
1 files 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; } |