From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ5Z-000627-TE for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:38:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJQ5V-0000Sl-L9 for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:38:17 -0400 Received: from mail-da0-f45.google.com ([209.85.210.45]:58274) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ5V-0000Jw-FU for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:38:13 -0400 Received: by mail-da0-f45.google.com with SMTP id n15so2455980dad.4 for ; Wed, 03 Oct 2012 07:38:13 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 3 Oct 2012 16:37:04 +0200 Message-Id: <1349275025-5093-18-git-send-email-pbonzini@redhat.com> In-Reply-To: <1349275025-5093-1-git-send-email-pbonzini@redhat.com> References: <1349275025-5093-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 17/18] qemu-sockets: add error propagation to inet_parse List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com Reviewed-by: Luiz Capitulino Signed-off-by: Paolo Bonzini --- qemu-sockets.c | 41 +++++++++++++++++++++-------------------- 1 file modificato, 21 inserzioni(+), 20 rimozioni(-) diff --git a/qemu-sockets.c b/qemu-sockets.c index 6f13121..55669e9 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -481,7 +481,7 @@ err: } /* compatibility wrapper */ -static int inet_parse(QemuOpts *opts, const char *str) +static void inet_parse(QemuOpts *opts, const char *str, Error **errp) { const char *optstr, *h; char addr[64]; @@ -493,32 +493,28 @@ static int inet_parse(QemuOpts *opts, const char *str) /* no host given */ addr[0] = '\0'; if (1 != sscanf(str,":%32[^,]%n",port,&pos)) { - fprintf(stderr, "%s: portonly parse error (%s)\n", - __FUNCTION__, str); - return -1; + error_setg(errp, "error parsing port in address '%s'", str); + return; } } else if (str[0] == '[') { /* IPv6 addr */ if (2 != sscanf(str,"[%64[^]]]:%32[^,]%n",addr,port,&pos)) { - fprintf(stderr, "%s: ipv6 parse error (%s)\n", - __FUNCTION__, str); - return -1; + error_setg(errp, "error parsing IPv6 address '%s'", str); + return; } qemu_opt_set(opts, "ipv6", "on"); } else if (qemu_isdigit(str[0])) { /* IPv4 addr */ if (2 != sscanf(str,"%64[0-9.]:%32[^,]%n",addr,port,&pos)) { - fprintf(stderr, "%s: ipv4 parse error (%s)\n", - __FUNCTION__, str); - return -1; + error_setg(errp, "error parsing IPv4 address '%s'", str); + return; } qemu_opt_set(opts, "ipv4", "on"); } else { /* hostname */ if (2 != sscanf(str,"%64[^:]:%32[^,]%n",addr,port,&pos)) { - fprintf(stderr, "%s: hostname parse error (%s)\n", - __FUNCTION__, str); - return -1; + error_setg(errp, "error parsing address '%s'", str); + return; } } qemu_opt_set(opts, "host", addr); @@ -533,7 +529,6 @@ static int inet_parse(QemuOpts *opts, const char *str) qemu_opt_set(opts, "ipv4", "on"); if (strstr(optstr, ",ipv6")) qemu_opt_set(opts, "ipv6", "on"); - return 0; } int inet_listen(const char *str, char *ostr, int olen, @@ -542,9 +537,11 @@ int inet_listen(const char *str, char *ostr, int olen, QemuOpts *opts; char *optstr; int sock = -1; + Error *local_err = NULL; opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); - if (inet_parse(opts, str) == 0) { + inet_parse(opts, str, &local_err); + if (local_err == NULL) { sock = inet_listen_opts(opts, port_offset, errp); if (sock != -1 && ostr) { optstr = strchr(str, ','); @@ -561,7 +558,7 @@ int inet_listen(const char *str, char *ostr, int olen, } } } else { - error_set(errp, QERR_SOCKET_CREATE_FAILED); + error_propagate(errp, local_err); } qemu_opts_del(opts); return sock; @@ -579,12 +576,14 @@ int inet_connect(const char *str, Error **errp) { QemuOpts *opts; int sock = -1; + Error *local_err = NULL; opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); - if (inet_parse(opts, str) == 0) { + inet_parse(opts, str, &local_err); + if (local_err == NULL) { sock = inet_connect_opts(opts, errp, NULL, NULL); } else { - error_set(errp, QERR_SOCKET_CREATE_FAILED); + error_propagate(errp, local_err); } qemu_opts_del(opts); return sock; @@ -609,14 +608,16 @@ int inet_nonblocking_connect(const char *str, { QemuOpts *opts; int sock = -1; + Error *local_err = NULL; g_assert(callback != NULL); opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); - if (inet_parse(opts, str) == 0) { + inet_parse(opts, str, &local_err); + if (local_err == NULL) { sock = inet_connect_opts(opts, errp, callback, opaque); } else { - error_set(errp, QERR_SOCKET_CREATE_FAILED); + error_propagate(errp, local_err); } qemu_opts_del(opts); return sock; -- 1.7.12.1