From patchwork Wed Sep 19 14:31:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 185062 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8AEDF2C0080 for ; Thu, 20 Sep 2012 00:40:24 +1000 (EST) Received: from localhost ([::1]:34126 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TELKi-0001NM-Jm for incoming@patchwork.ozlabs.org; Wed, 19 Sep 2012 10:32:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TELK1-0000Ny-QH for qemu-devel@nongnu.org; Wed, 19 Sep 2012 10:32:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TELJv-0005OP-SA for qemu-devel@nongnu.org; Wed, 19 Sep 2012 10:32:13 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:50022) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TELJv-0005F9-Lo for qemu-devel@nongnu.org; Wed, 19 Sep 2012 10:32:07 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so2588440pbb.4 for ; Wed, 19 Sep 2012 07:32:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=BvV2zNNP4wffFHAdGNlC/+ZYrACe2GQHFi5hvPJEKqM=; b=ho/qojjJ+XKJn7OJHbuV2/gzU9g4Nvo+1I6h4szfu2lEUAL8R2La9h5jsHVvh+pFqg oKsmNlS9moUDrMzpKSF1gh5Rt+mcXBIB2V1vUPgP+DtefctmrGHDphGa+C0wndNWSCQ0 upQzY0rFT8t1fc9Rqq0wstuJRzH9ZyI5cKVGwQZ7GwdPtZt/G9MwgS1kC6hQAef27D8+ zkfFVwaEkdA1FN16h/zdZU/ACjdpnUvScqgbvBnbbsbDXm6vGJ5klA6LWRwh7aKX51Da urhjGkHqbyJmY2XYaJU+qGQ0cjDxsY2I+i+nLhpAyK0UWql6ZMpPdfEM22Jo4ZNcXo/O 2wZw== Received: by 10.68.241.228 with SMTP id wl4mr7951868pbc.51.1348065127332; Wed, 19 Sep 2012 07:32:07 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id it5sm1939572pbc.10.2012.09.19.07.32.04 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 19 Sep 2012 07:32:06 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 19 Sep 2012 16:31:10 +0200 Message-Id: <1348065078-5139-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1348065078-5139-1-git-send-email-pbonzini@redhat.com> References: <1348065078-5139-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 07/12] qemu-sockets: add error propagation to inet_parse X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- qemu-sockets.c | 35 +++++++++++++++++------------------ 1 file modificato, 17 inserzioni(+), 18 rimozioni(-) diff --git a/qemu-sockets.c b/qemu-sockets.c index 361d890..5942aef 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -407,7 +407,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]; @@ -419,32 +419,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); @@ -459,7 +455,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, @@ -468,9 +463,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, ','); @@ -487,7 +484,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; @@ -497,15 +494,17 @@ int inet_connect(const char *str, bool block, bool *in_progress, 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) { if (block) { qemu_opt_set(opts, "block", "on"); } sock = inet_connect_opts(opts, in_progress, errp); } else { - error_set(errp, QERR_SOCKET_CREATE_FAILED); + error_propagate(errp, local_err); } qemu_opts_del(opts); return sock;