From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPCiM-0007BG-RF for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:34:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TPCiG-0006ha-Dh for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:34:14 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:36749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPCiG-0006Qo-74 for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:34:08 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so437208pbb.4 for ; Fri, 19 Oct 2012 06:34:07 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 19 Oct 2012 15:32:00 +0200 Message-Id: <1350653528-5834-22-git-send-email-pbonzini@redhat.com> In-Reply-To: <1350653528-5834-1-git-send-email-pbonzini@redhat.com> References: <1350653528-5834-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 21/29] qemu-sockets: add error propagation to Unix socket functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Before: $ qemu-system-x86_64 -monitor unix:/vvv,server=off connect(unix:/vvv): No such file or directory chardev: opening backend "socket" failed After: $ x86_64-softmmu/qemu-system-x86_64 -monitor unix:/vvv,server=off qemu-system-x86_64: -monitor unix:/vvv,server=off: Failed to connect to socket: No such file or directory chardev: opening backend "socket" failed Reviewed-by: Paolo Bonzini Signed-off-by: Paolo Bonzini --- qemu-sockets.c | 16 ++++++++-------- 1 file modificato, 8 inserzioni(+), 8 rimozioni(-) diff --git a/qemu-sockets.c b/qemu-sockets.c index fb9c4c9..daff8e6 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -632,7 +632,7 @@ int unix_listen_opts(QemuOpts *opts, Error **errp) sock = qemu_socket(PF_UNIX, SOCK_STREAM, 0); if (sock < 0) { - perror("socket(unix)"); + error_set_errno(errp, errno, QERR_SOCKET_CREATE_FAILED); return -1; } @@ -657,11 +657,11 @@ int unix_listen_opts(QemuOpts *opts, Error **errp) unlink(un.sun_path); if (bind(sock, (struct sockaddr*) &un, sizeof(un)) < 0) { - fprintf(stderr, "bind(unix:%s): %s\n", un.sun_path, strerror(errno)); + error_set_errno(errp, errno, QERR_SOCKET_BIND_FAILED); goto err; } if (listen(sock, 1) < 0) { - fprintf(stderr, "listen(unix:%s): %s\n", un.sun_path, strerror(errno)); + error_set_errno(errp, errno, QERR_SOCKET_LISTEN_FAILED); goto err; } @@ -681,13 +681,13 @@ int unix_connect_opts(QemuOpts *opts, Error **errp, int sock, rc; if (NULL == path) { - fprintf(stderr, "unix connect: no path specified\n"); + error_setg(errp, "unix connect: no path specified\n"); return -1; } sock = qemu_socket(PF_UNIX, SOCK_STREAM, 0); if (sock < 0) { - perror("socket(unix)"); + error_set_errno(errp, errno, QERR_SOCKET_CREATE_FAILED); return -1; } if (callback != NULL) { @@ -722,7 +722,7 @@ int unix_connect_opts(QemuOpts *opts, Error **errp, } if (rc < 0) { - fprintf(stderr, "connect(unix:%s): %s\n", path, strerror(errno)); + error_set_errno(errp, -rc, QERR_SOCKET_CONNECT_FAILED); close(sock); sock = -1; } @@ -735,7 +735,7 @@ int unix_connect_opts(QemuOpts *opts, Error **errp, int unix_listen_opts(QemuOpts *opts, Error **errp) { - fprintf(stderr, "unix sockets are not available on windows\n"); + error_setg(errp, "unix sockets are not available on windows"); errno = ENOTSUP; return -1; } @@ -743,7 +743,7 @@ int unix_listen_opts(QemuOpts *opts, Error **errp) int unix_connect_opts(QemuOpts *opts, Error **errp, NonBlockingConnectHandler *callback, void *opaque) { - fprintf(stderr, "unix sockets are not available on windows\n"); + error_setg(errp, "unix sockets are not available on windows"); errno = ENOTSUP; return -1; } -- 1.7.12.1