Fix usage of error_append_hint()

[Qemu-devel] [PATCH 16/17] socket: Pass local error object pointer to error_append_hint()

Greg Kurz posted 17 patches 6 years, 1 month ago

Download mbox

Maintainers: Yuval Shaia <yuval.shaia@oracle.com>, Eric Blake <eblake@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Halil Pasic <pasic@linux.ibm.com>, Markus Armbruster <armbru@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, David Gibson <david@gibson.dropbear.id.au>, John Snow <jsnow@redhat.com>, Fam Zheng <fam@euphon.net>, Richard Henderson <rth@twiddle.net>, Jeff Cody <codyprime@gmail.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Gerd Hoffmann <kraxel@redhat.com>, Max Reitz <mreitz@redhat.com>, Subbaraya Sundeep <sundeep.lkml@gmail.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Eric Farman <farman@linux.ibm.com>, Peter Maydell <peter.maydell@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, Christian Borntraeger <borntraeger@de.ibm.com>, Juan Quintela <quintela@redhat.com>, Alex Williamson <alex.williamson@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Michael Roth <mdroth@linux.vnet.ibm.com>, David Hildenbrand <david@redhat.com>, Cornelia Huck <cohuck@redhat.com>

Expand all Fold all

[Qemu-devel] [PATCH 16/17] socket: Pass local error object pointer to error_append_hint()

Posted by Greg Kurz 6 years, 1 month ago

Ensure that hints are added even if errp is &error_fatal or &error_abort.

Signed-off-by: Greg Kurz <groug@kaod.org>
---
 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;
     }