From b71d7e73f04f4cb0c965f55fef6bdcd812e78654 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: <94968b7fa9b14e71f004474d7ce77e189e6a2bf3.1349175436.git.minovotn@redhat.com> References: <94968b7fa9b14e71f004474d7ce77e189e6a2bf3.1349175436.git.minovotn@redhat.com> From: Amos Kong Date: Mon, 1 Oct 2012 14:12:38 +0200 Subject: [PATCH 25/34] sockets: use error class to pass listen error RH-Author: Amos Kong Message-id: <1349100767-9066-6-git-send-email-akong@redhat.com> Patchwork-id: 42564 O-Subject: [RHEL-6.4 qemu-kvm PATCH v7 05/14] sockets: use error class to pass listen error Bugzilla: 680356 RH-Acked-by: Paolo Bonzini RH-Acked-by: Markus Armbruster RH-Acked-by: Orit Wasserman Add a new argument in inet_listen()/inet_listen_opts() to pass back listen error. Change nbd, qemu-char, vnc to use new interface. (Cherry-picked from commit 029409e5a9568e9032634847587e24bba66b252b) Conflicts: nbd.c (internal ndb.c doesn't use inet_connect(), nothing needs to change) ui/vnc.c (internal didn't rename 'vnc.c' to 'ui/vnc.c') Signed-off-by: Amos Kong Reviewed-by: Orit Wasserman Reviewed-by: Michael Roth Signed-off-by: Anthony Liguori --- qemu-char.c | 2 +- qemu-sockets.c | 17 ++++++++++++++--- qemu_socket.h | 4 ++-- vnc.c | 3 ++- 4 files changed, 19 insertions(+), 7 deletions(-) Signed-off-by: Michal Novotny --- qemu-char.c | 2 +- qemu-sockets.c | 17 ++++++++++++++--- qemu_socket.h | 4 ++-- vnc.c | 3 ++- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index d3ba118..e4ad0ea 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2348,7 +2348,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 8fdf59c..c5e20ff 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); @@ -446,7 +455,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; @@ -454,7 +463,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)) { @@ -469,6 +478,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 d1794d1..927f02f 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -40,9 +40,9 @@ void socket_set_nonblock(int fd); int send_all(CharDriverState *chr, 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/vnc.c b/vnc.c index 113c5f4..6375c41 100644 --- a/vnc.c +++ b/vnc.c @@ -2864,7 +2864,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) { free(dpy); -- 1.7.11.4