| Message ID | 20240429064536.238392-7-mjt@tls.msk.ru (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [PULL,1/9] target/i386/cpu: Remove "x86" prefix from the CPU list | expand |
On 4/28/24 23:45, Michael Tokarev wrote: > From: Li Zhijian via <qemu-devel@nongnu.org> Please fix the author on this patch. r~ > > 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; > } >
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; }