From 3f9286b7214fbc7135d4fc223f07b0b30b91e2f1 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 19 May 2014 18:57:37 +0200 Subject: qemu-socket: Clean up inet_connect_opts() Separate the search for a working addrinfo from the code that does something with it. Makes for a clearer search loop. Use a local Error * to simplify resetting the error in the search loop. Signed-off-by: Markus Armbruster Reviewed-by: Paolo Bonzini Signed-off-by: Gerd Hoffmann --- util/qemu-sockets.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'util') diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 8818d7c0de..627e60931a 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -354,6 +354,7 @@ static struct addrinfo *inet_parse_connect_opts(QemuOpts *opts, Error **errp) int inet_connect_opts(QemuOpts *opts, Error **errp, NonBlockingConnectHandler *callback, void *opaque) { + Error *local_err = NULL; struct addrinfo *res, *e; int sock = -1; bool in_progress; @@ -372,24 +373,27 @@ int inet_connect_opts(QemuOpts *opts, Error **errp, } for (e = res; e != NULL; e = e->ai_next) { - if (error_is_set(errp)) { - error_free(*errp); - *errp = NULL; - } + error_free(local_err); + local_err = NULL; if (connect_state != NULL) { connect_state->current_addr = e; } - sock = inet_connect_addr(e, &in_progress, connect_state, errp); - if (in_progress) { - return sock; - } else if (sock >= 0) { - /* non blocking socket immediate success, call callback */ - if (callback != NULL) { - callback(sock, opaque); - } + sock = inet_connect_addr(e, &in_progress, connect_state, &local_err); + if (sock >= 0) { break; } } + + if (sock < 0) { + error_propagate(errp, local_err); + } else if (in_progress) { + /* wait_for_connect() will do the rest */ + return sock; + } else { + if (callback) { + callback(sock, opaque); + } + } g_free(connect_state); freeaddrinfo(res); return sock; -- cgit v1.2.1 From d2e064a73ee7e5af244ff7b6406ac2344bbaa231 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 19 May 2014 18:57:38 +0200 Subject: error: error_is_set() is finally unused; remove Signed-off-by: Markus Armbruster Signed-off-by: Gerd Hoffmann --- util/error.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'util') diff --git a/util/error.c b/util/error.c index 66245ccd1f..2ace0d8dd9 100644 --- a/util/error.c +++ b/util/error.c @@ -142,11 +142,6 @@ Error *error_copy(const Error *err) return err_new; } -bool error_is_set(Error **errp) -{ - return (errp && *errp); -} - ErrorClass error_get_class(const Error *err) { return err->err_class; -- cgit v1.2.1