From patchwork Thu Apr 19 07:11:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 153662 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 50722B6FAA for ; Thu, 19 Apr 2012 17:12:15 +1000 (EST) Received: from localhost ([::1]:46666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKlXJ-0006dn-45 for incoming@patchwork.ozlabs.org; Thu, 19 Apr 2012 03:12:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKlWw-0006CA-1h for qemu-devel@nongnu.org; Thu, 19 Apr 2012 03:11:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKlWp-0007v6-2n for qemu-devel@nongnu.org; Thu, 19 Apr 2012 03:11:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKlWo-0007v0-QT for qemu-devel@nongnu.org; Thu, 19 Apr 2012 03:11:42 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3J7Bec5012485 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 19 Apr 2012 03:11:40 -0400 Received: from dhcp-8-167.nay.redhat.com (dhcp-8-167.nay.redhat.com [10.66.8.167]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q3J7BaYK026275; Thu, 19 Apr 2012 03:11:37 -0400 To: aliguori@us.ibm.com, quintela@redhat.com, jasowang@redhat.com, mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, owasserm@redhat.com, laine@redhat.com From: Amos Kong Date: Thu, 19 Apr 2012 15:11:44 +0800 Message-ID: <20120419071144.26838.14551.stgit@dhcp-8-167.nay.redhat.com> In-Reply-To: <20120419071032.26838.16654.stgit@dhcp-8-167.nay.redhat.com> References: <20120419071032.26838.16654.stgit@dhcp-8-167.nay.redhat.com> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v7 3/4] sockets: use error class to pass listen error 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 Add a new argument in inet_listen()/inet_listen_opts() to pass back listen error. Change nbd, qemu-char, vnc to use new interface. Signed-off-by: Amos Kong --- nbd.c | 2 +- qemu-char.c | 2 +- qemu-sockets.c | 17 ++++++++++++++--- qemu_socket.h | 4 ++-- ui/vnc.c | 3 ++- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/nbd.c b/nbd.c index bb71f00..ae4279a 100644 --- a/nbd.c +++ b/nbd.c @@ -160,7 +160,7 @@ int tcp_socket_incoming_spec(const char *address_and_port) { char *ostr = NULL; int olen = 0; - return inet_listen(address_and_port, ostr, olen, SOCK_STREAM, 0); + return inet_listen(address_and_port, ostr, olen, SOCK_STREAM, 0, NULL); } int unix_socket_incoming(const char *path) diff --git a/qemu-char.c b/qemu-char.c index aeee2e8..54196eb 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2442,7 +2442,7 @@ static CharDriverState *qemu_chr_open_socket(QemuOpts *opts) } } else { if (is_listen) { - fd = inet_listen_opts(opts, 0); + fd = inet_listen_opts(opts, 0, NULL); } else { fd = inet_connect_opts(opts, NULL); } diff --git a/qemu-sockets.c b/qemu-sockets.c index a761ef6..d6e798b 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -103,7 +103,7 @@ const char *inet_strfamily(int family) return "unknown"; } -int inet_listen_opts(QemuOpts *opts, int port_offset) +int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp) { struct addrinfo ai,*res,*e; const char *addr; @@ -120,6 +120,7 @@ int inet_listen_opts(QemuOpts *opts, int port_offset) if ((qemu_opt_get(opts, "host") == NULL) || (qemu_opt_get(opts, "port") == NULL)) { fprintf(stderr, "%s: host and/or port not specified\n", __FUNCTION__); + error_set(errp, QERR_SOCKET_CREATE_FAILED); return -1; } pstrcpy(port, sizeof(port), qemu_opt_get(opts, "port")); @@ -138,6 +139,7 @@ int inet_listen_opts(QemuOpts *opts, int port_offset) if (rc != 0) { fprintf(stderr,"getaddrinfo(%s,%s): %s\n", addr, port, gai_strerror(rc)); + error_set(errp, QERR_SOCKET_CREATE_FAILED); return -1; } @@ -150,6 +152,9 @@ int inet_listen_opts(QemuOpts *opts, int port_offset) if (slisten < 0) { fprintf(stderr,"%s: socket(%s): %s\n", __FUNCTION__, inet_strfamily(e->ai_family), strerror(errno)); + if (!e->ai_next) { + error_set(errp, QERR_SOCKET_CREATE_FAILED); + } continue; } @@ -173,6 +178,9 @@ int inet_listen_opts(QemuOpts *opts, int port_offset) fprintf(stderr,"%s: bind(%s,%s,%d): %s\n", __FUNCTION__, inet_strfamily(e->ai_family), uaddr, inet_getport(e), strerror(errno)); + if (!e->ai_next) { + error_set(errp, QERR_SOCKET_BIND_FAILED); + } } } closesocket(slisten); @@ -183,6 +191,7 @@ int inet_listen_opts(QemuOpts *opts, int port_offset) listen: if (listen(slisten,1) != 0) { + error_set(errp, QERR_SOCKET_LISTEN_FAILED); perror("listen"); closesocket(slisten); freeaddrinfo(res); @@ -447,7 +456,7 @@ static int inet_parse(QemuOpts *opts, const char *str) } int inet_listen(const char *str, char *ostr, int olen, - int socktype, int port_offset) + int socktype, int port_offset, Error **errp) { QemuOpts *opts; char *optstr; @@ -455,7 +464,7 @@ int inet_listen(const char *str, char *ostr, int olen, opts = qemu_opts_create(&dummy_opts, NULL, 0); if (inet_parse(opts, str) == 0) { - sock = inet_listen_opts(opts, port_offset); + sock = inet_listen_opts(opts, port_offset, errp); if (sock != -1 && ostr) { optstr = strchr(str, ','); if (qemu_opt_get_bool(opts, "ipv6", 0)) { @@ -470,6 +479,8 @@ int inet_listen(const char *str, char *ostr, int olen, optstr ? optstr : ""); } } + } else { + error_set(errp, QERR_SOCKET_CREATE_FAILED); } qemu_opts_del(opts); return sock; diff --git a/qemu_socket.h b/qemu_socket.h index 26998ef..4689ff3 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -39,9 +39,9 @@ void socket_set_nonblock(int fd); int send_all(int fd, const void *buf, int len1); /* New, ipv6-ready socket helper functions, see qemu-sockets.c */ -int inet_listen_opts(QemuOpts *opts, int port_offset); +int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp); int inet_listen(const char *str, char *ostr, int olen, - int socktype, int port_offset); + int socktype, int port_offset, Error **errp); int inet_connect_opts(QemuOpts *opts, Error **errp); int inet_connect(const char *str, bool block, Error **errp); int inet_dgram_opts(QemuOpts *opts); diff --git a/ui/vnc.c b/ui/vnc.c index 3ae7704..be384a5 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3088,7 +3088,8 @@ int vnc_display_open(DisplayState *ds, const char *display) pstrcpy(dpy, 256, "unix:"); vs->lsock = unix_listen(display+5, dpy+5, 256-5); } else { - vs->lsock = inet_listen(display, dpy, 256, SOCK_STREAM, 5900); + vs->lsock = inet_listen(display, dpy, 256, + SOCK_STREAM, 5900, NULL); } if (-1 == vs->lsock) { g_free(dpy);