From patchwork Mon Oct 1 14:52:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 188316 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 D05E32C00BA for ; Tue, 2 Oct 2012 01:20:31 +1000 (EST) Received: from localhost ([::1]:47876 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIhNW-0006OF-GL for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2012 10:53:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIhMi-0004K4-LM for qemu-devel@nongnu.org; Mon, 01 Oct 2012 10:53:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TIhMY-0002kl-AE for qemu-devel@nongnu.org; Mon, 01 Oct 2012 10:53:00 -0400 Received: from mail-da0-f45.google.com ([209.85.210.45]:57249) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIhMY-0002hg-3w for qemu-devel@nongnu.org; Mon, 01 Oct 2012 10:52:50 -0400 Received: by mail-da0-f45.google.com with SMTP id n15so1562746dad.4 for ; Mon, 01 Oct 2012 07:52:49 -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=8vL8J3DvqIyeDbXrlhI3pvk9gBoo0SJOD3pRBwfIMF8=; b=CtfO/ehVKcHQo2p4kvgTe+g5KOAvh+/cvTOQHMc+FSstd+maV4y7jB7plk4wFYNCWQ Q/0GtFMUa7mCTtD3xhcPedlzSWv1Roihb2KzVYrqo1OLCEQ0gs2Zt2SQ3ngzzH9J5/vK Vs9Ds9Q92fYz2YdeB2HdmBT4UaXRQBiseUulg2np85QejPGpzho0Eg0lHIL9khzBF+1F yydTqwCvuCIBDjPD8Ylrskk3wN7+mju2qE//Z88khM7eQjQ9sA2lhGVH3ISOwhTTAR9w VzwiRROBed7pxV/l4vHFjQZbB1ow9pkOYK2NDR9CI5TpUDmK0pc5K+AE3wNyW3wqaa1j YRlA== Received: by 10.68.204.137 with SMTP id ky9mr41431495pbc.90.1349103169605; Mon, 01 Oct 2012 07:52:49 -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 g1sm10494388paz.18.2012.10.01.07.52.46 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Oct 2012 07:52:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 1 Oct 2012 16:52:19 +0200 Message-Id: <1349103144-6827-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1349103144-6827-1-git-send-email-pbonzini@redhat.com> References: <1349103144-6827-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.210.45 Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v2 4/9] qemu-sockets: add error propagation to Unix socket functions 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 This patch starts harmonizing unix_* and inet_* functions. Signed-off-by: Paolo Bonzini --- nbd.c | 4 ++-- qemu-char.c | 4 ++-- qemu-sockets.c | 40 ++++++++++++++++++++-------------------- qemu_socket.h | 8 ++++---- qga/channel-posix.c | 2 +- ui/vnc.c | 4 ++-- 6 file modificati, 31 inserzioni(+), 31 rimozioni(-) diff --git a/nbd.c b/nbd.c index 6f0db62..f61a288 100644 --- a/nbd.c +++ b/nbd.c @@ -230,12 +230,12 @@ int unix_socket_incoming(const char *path) char *ostr = NULL; int olen = 0; - return unix_listen(path, ostr, olen); + return unix_listen(path, ostr, olen, NULL); } int unix_socket_outgoing(const char *path) { - return unix_connect(path); + return unix_connect(path, NULL); } /* Basic flow for negotiation diff --git a/qemu-char.c b/qemu-char.c index b082bae..fa294c0 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2448,9 +2448,9 @@ static CharDriverState *qemu_chr_open_socket(QemuOpts *opts) if (is_unix) { if (is_listen) { - fd = unix_listen_opts(opts); + fd = unix_listen_opts(opts, NULL); } else { - fd = unix_connect_opts(opts); + fd = unix_connect_opts(opts, NULL); } } else { if (is_listen) { diff --git a/qemu-sockets.c b/qemu-sockets.c index bf1f794..1e69274 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -655,7 +655,7 @@ int inet_nonblocking_connect(const char *str, #ifndef _WIN32 -int unix_listen_opts(QemuOpts *opts) +int unix_listen_opts(QemuOpts *opts, Error **errp) { struct sockaddr_un un; const char *path = qemu_opt_get(opts, "path"); @@ -663,7 +663,7 @@ int unix_listen_opts(QemuOpts *opts) sock = qemu_socket(PF_UNIX, SOCK_STREAM, 0); if (sock < 0) { - perror("socket(unix)"); + error_set(errp, QERR_SOCKET_CREATE_FAILED); return -1; } @@ -688,11 +688,11 @@ int unix_listen_opts(QemuOpts *opts) 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(errp, 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(errp, QERR_SOCKET_LISTEN_FAILED); goto err; } @@ -703,20 +703,20 @@ err: return -1; } -int unix_connect_opts(QemuOpts *opts) +int unix_connect_opts(QemuOpts *opts, Error **errp) { struct sockaddr_un un; const char *path = qemu_opt_get(opts, "path"); int sock; 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(errp, QERR_SOCKET_CREATE_FAILED); return -1; } @@ -724,7 +724,7 @@ int unix_connect_opts(QemuOpts *opts) un.sun_family = AF_UNIX; snprintf(un.sun_path, sizeof(un.sun_path), "%s", path); if (connect(sock, (struct sockaddr*) &un, sizeof(un)) < 0) { - fprintf(stderr, "connect(unix:%s): %s\n", path, strerror(errno)); + error_set(errp, QERR_SOCKET_CONNECT_FAILED); close(sock); return -1; } @@ -733,7 +733,7 @@ int unix_connect_opts(QemuOpts *opts) } /* compatibility wrapper */ -int unix_listen(const char *str, char *ostr, int olen) +int unix_listen(const char *str, char *ostr, int olen, Error **errp) { QemuOpts *opts; char *path, *optstr; @@ -754,7 +754,7 @@ int unix_listen(const char *str, char *ostr, int olen) qemu_opt_set(opts, "path", str); } - sock = unix_listen_opts(opts); + sock = unix_listen_opts(opts, errp); if (sock != -1 && ostr) snprintf(ostr, olen, "%s%s", qemu_opt_get(opts, "path"), optstr ? optstr : ""); @@ -762,44 +762,44 @@ int unix_listen(const char *str, char *ostr, int olen) return sock; } -int unix_connect(const char *path) +int unix_connect(const char *path, Error **errp) { QemuOpts *opts; int sock; opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); qemu_opt_set(opts, "path", path); - sock = unix_connect_opts(opts); + sock = unix_connect_opts(opts, errp); qemu_opts_del(opts); return sock; } #else -int unix_listen_opts(QemuOpts *opts) +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\n"); errno = ENOTSUP; return -1; } -int unix_connect_opts(QemuOpts *opts) +int unix_connect_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\n"); errno = ENOTSUP; return -1; } -int unix_listen(const char *path, char *ostr, int olen) +int unix_listen(const char *path, char *ostr, int olen, Error **errp) { - fprintf(stderr, "unix sockets are not available on windows\n"); + error_setg(errp, "unix sockets are not available on windows\n"); errno = ENOTSUP; return -1; } -int unix_connect(const char *path) +int unix_connect(const char *path, Error **errp) { - fprintf(stderr, "unix sockets are not available on windows\n"); + error_setg(errp, "unix sockets are not available on windows\n"); errno = ENOTSUP; return -1; } diff --git a/qemu_socket.h b/qemu_socket.h index 3e8aee9..afe8689 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -56,10 +56,10 @@ int inet_nonblocking_connect(const char *str, int inet_dgram_opts(QemuOpts *opts); const char *inet_strfamily(int family); -int unix_listen_opts(QemuOpts *opts); -int unix_listen(const char *path, char *ostr, int olen); -int unix_connect_opts(QemuOpts *opts); -int unix_connect(const char *path); +int unix_listen_opts(QemuOpts *opts, Error **errp); +int unix_listen(const char *path, char *ostr, int olen, Error **errp); +int unix_connect_opts(QemuOpts *opts, Error **errp); +int unix_connect(const char *path, Error **errp); /* Old, ipv4 only bits. Don't use for new code. */ int parse_host_port(struct sockaddr_in *saddr, const char *str); diff --git a/qga/channel-posix.c b/qga/channel-posix.c index 57eea06..e22eee6 100644 --- a/qga/channel-posix.c +++ b/qga/channel-posix.c @@ -181,7 +181,7 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path, GAChannelMethod break; } case GA_CHANNEL_UNIX_LISTEN: { - int fd = unix_listen(path, NULL, strlen(path)); + int fd = unix_listen(path, NULL, strlen(path), NULL); if (fd == -1) { g_critical("error opening path: %s", strerror(errno)); return false; diff --git a/ui/vnc.c b/ui/vnc.c index 01b2daf..235596e 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3059,7 +3059,7 @@ int vnc_display_open(DisplayState *ds, const char *display) if (reverse) { /* connect to viewer */ if (strncmp(display, "unix:", 5) == 0) - vs->lsock = unix_connect(display+5); + vs->lsock = unix_connect(display+5, NULL); else vs->lsock = inet_connect(display, NULL); if (-1 == vs->lsock) { @@ -3079,7 +3079,7 @@ int vnc_display_open(DisplayState *ds, const char *display) dpy = g_malloc(256); if (strncmp(display, "unix:", 5) == 0) { pstrcpy(dpy, 256, "unix:"); - vs->lsock = unix_listen(display+5, dpy+5, 256-5); + vs->lsock = unix_listen(display+5, dpy+5, 256-5, NULL); } else { vs->lsock = inet_listen(display, dpy, 256, SOCK_STREAM, 5900, NULL);