From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TO6di-0006XB-9u for qemu-devel@nongnu.org; Tue, 16 Oct 2012 08:53:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TO6db-0002ly-K6 for qemu-devel@nongnu.org; Tue, 16 Oct 2012 08:52:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60197) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TO6db-0002lu-BQ for qemu-devel@nongnu.org; Tue, 16 Oct 2012 08:52:47 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9GCqkFl014088 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 16 Oct 2012 08:52:46 -0400 Date: Tue, 16 Oct 2012 09:53:43 -0300 From: Luiz Capitulino Message-ID: <20121016095343.57c058d2@doriath.home> In-Reply-To: <1349877786-23514-16-git-send-email-pbonzini@redhat.com> References: <1349877786-23514-1-git-send-email-pbonzini@redhat.com> <1349877786-23514-16-git-send-email-pbonzini@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 15/25] qemu-sockets: add error propagation to inet_connect_addr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org On Wed, 10 Oct 2012 16:02:56 +0200 Paolo Bonzini wrote: > perror and fprintf can be removed because all clients can now consume > Errors properly. However, we need to change the non-blocking connect > handlers to take an Error, in order to improve error handling for > migration with the TCP protocol. > > Reviewed-by: Paolo Bonzini > Signed-off-by: Paolo Bonzini Are you guys related? :) Do you want me to clean this up before applying or doesn't matter? > --- > qemu-sockets.c | 15 ++++++--------- > 1 file modificato, 6 inserzioni(+), 9 rimozioni(-) > > diff --git a/qemu-sockets.c b/qemu-sockets.c > index 3c19463..d0e1a41 100644 > --- a/qemu-sockets.c > +++ b/qemu-sockets.c > @@ -216,7 +216,7 @@ typedef struct ConnectState { > } ConnectState; > > static int inet_connect_addr(struct addrinfo *addr, bool *in_progress, > - ConnectState *connect_state); > + ConnectState *connect_state, Error **errp); > > static void wait_for_connect(void *opaque) > { > @@ -246,7 +246,7 @@ static void wait_for_connect(void *opaque) > if (s->current_addr) { > while (s->current_addr->ai_next != NULL && s->fd < 0) { > s->current_addr = s->current_addr->ai_next; > - s->fd = inet_connect_addr(s->current_addr, &in_progress, s); > + s->fd = inet_connect_addr(s->current_addr, &in_progress, s, NULL); > /* connect in progress */ > if (in_progress) { > return; > @@ -263,7 +263,7 @@ static void wait_for_connect(void *opaque) > } > > static int inet_connect_addr(struct addrinfo *addr, bool *in_progress, > - ConnectState *connect_state) > + ConnectState *connect_state, Error **errp) > { > int sock, rc; > > @@ -271,8 +271,7 @@ static int inet_connect_addr(struct addrinfo *addr, bool *in_progress, > > sock = qemu_socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol); > if (sock < 0) { > - fprintf(stderr, "%s: socket(%s): %s\n", __func__, > - inet_strfamily(addr->ai_family), strerror(errno)); > + error_set_errno(errp, errno, QERR_SOCKET_CREATE_FAILED); > return -1; > } > qemu_setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); > @@ -293,6 +292,7 @@ static int inet_connect_addr(struct addrinfo *addr, bool *in_progress, > connect_state); > *in_progress = true; > } else if (rc < 0) { > + error_set_errno(errp, errno, QERR_SOCKET_CONNECT_FAILED); > closesocket(sock); > return -1; > } > @@ -375,7 +375,7 @@ int inet_connect_opts(QemuOpts *opts, Error **errp, > if (connect_state != NULL) { > connect_state->current_addr = e; > } > - sock = inet_connect_addr(e, &in_progress, connect_state); > + sock = inet_connect_addr(e, &in_progress, connect_state, errp); > if (in_progress) { > return sock; > } else if (sock >= 0) { > @@ -386,9 +386,6 @@ int inet_connect_opts(QemuOpts *opts, Error **errp, > break; > } > } > - if (sock < 0) { > - error_set(errp, QERR_SOCKET_CONNECT_FAILED); > - } > g_free(connect_state); > freeaddrinfo(res); > return sock;