[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/17] socket: Pass local error object pointer to er
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PATCH 16/17] socket: Pass local error object pointer to error_append_hint() |
Date: |
Tue, 17 Sep 2019 12:22:12 +0200 |
User-agent: |
StGit/unknown-version |
Ensure that hints are added even if errp is &error_fatal or &error_abort.
Signed-off-by: Greg Kurz <address@hidden>
---
util/qemu-sockets.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 98ff3a1cce64..5da7b5f2fa0d 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -882,9 +882,12 @@ static int unix_listen_saddr(UnixSocketAddress *saddr,
pathlen = strlen(path);
if (pathlen > sizeof(un.sun_path)) {
- error_setg(errp, "UNIX socket path '%s' is too long", path);
- error_append_hint(errp, "Path must be less than %zu bytes\n",
+ Error *local_err = NULL;
+
+ error_setg(&local_err, "UNIX socket path '%s' is too long", path);
+ error_append_hint(&local_err, "Path must be less than %zu bytes\n",
sizeof(un.sun_path));
+ error_propagate(errp, local_err);
goto err;
}
@@ -952,9 +955,12 @@ static int unix_connect_saddr(UnixSocketAddress *saddr,
Error **errp)
pathlen = strlen(saddr->path);
if (pathlen > sizeof(un.sun_path)) {
- error_setg(errp, "UNIX socket path '%s' is too long", saddr->path);
- error_append_hint(errp, "Path must be less than %zu bytes\n",
+ Error *local_err = NULL;
+
+ error_setg(&local_err, "UNIX socket path '%s' is too long",
saddr->path);
+ error_append_hint(&local_err, "Path must be less than %zu bytes\n",
sizeof(un.sun_path));
+ error_propagate(errp, local_err);
goto err;
}
- [Qemu-devel] [PATCH 09/17] hw/rdma: Fix missing conversion to rdma_error_report(), (continued)
- [Qemu-devel] [PATCH 09/17] hw/rdma: Fix missing conversion to rdma_error_report(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 10/17] s390x/css: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 11/17] scsi: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 12/17] migration: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 13/17] nbd: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 14/17] ccid-card-emul: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 15/17] option: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 16/17] socket: Pass local error object pointer to error_append_hint(),
Greg Kurz <=
- [Qemu-devel] [PATCH 17/17] checkpatch: Warn when errp is passed to error_append_hint(), Greg Kurz, 2019/09/17
- Re: [Qemu-devel] [PATCH 00/17] Fix usage of error_append_hint(), Philippe Mathieu-Daudé, 2019/09/17