From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RB636-0004kc-DD for qemu-devel@nongnu.org; Tue, 04 Oct 2011 10:32:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RB634-0008Rh-TV for qemu-devel@nongnu.org; Tue, 04 Oct 2011 10:32:48 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:34981) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RB634-0008Q0-QH for qemu-devel@nongnu.org; Tue, 04 Oct 2011 10:32:46 -0400 Received: by iagf6 with SMTP id f6so770302iag.4 for ; Tue, 04 Oct 2011 07:32:46 -0700 (PDT) Message-ID: <4E8B190B.9010802@codemonkey.ws> Date: Tue, 04 Oct 2011 09:32:43 -0500 From: Anthony Liguori MIME-Version: 1.0 References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 21/23] migration: Don't use callback on file defining it List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org On 09/23/2011 07:57 AM, Juan Quintela wrote: > Signed-off-by: Juan Quintela I don't think this is better. It just eliminates the possibility of having useful trace points in get_error. Regards, Anthony Liguori > --- > migration-tcp.c | 4 ++-- > migration-unix.c | 6 +++--- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/migration-tcp.c b/migration-tcp.c > index f6b2288..bd3aa3a 100644 > --- a/migration-tcp.c > +++ b/migration-tcp.c > @@ -58,7 +58,7 @@ static void tcp_wait_for_connect(void *opaque) > DPRINTF("connect completed\n"); > do { > ret = getsockopt(s->fd, SOL_SOCKET, SO_ERROR, (void *)&val,&valsize); > - } while (ret == -1&& (s->get_error(s)) == EINTR); > + } while (ret == -1&& (socket_error()) == EINTR); > > if (ret< 0) { > migrate_fd_error(s); > @@ -98,7 +98,7 @@ int tcp_start_outgoing_migration(MigrationState *s, const char *host_port) > do { > ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr)); > if (ret == -1) > - ret = -(s->get_error(s)); > + ret = -(socket_error()); > > if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) > qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s); > diff --git a/migration-unix.c b/migration-unix.c > index d6f315a..7205b25 100644 > --- a/migration-unix.c > +++ b/migration-unix.c > @@ -57,7 +57,7 @@ static void unix_wait_for_connect(void *opaque) > DPRINTF("connect completed\n"); > do { > ret = getsockopt(s->fd, SOL_SOCKET, SO_ERROR, (void *)&val,&valsize); > - } while (ret == -1&& (s->get_error(s)) == EINTR); > + } while (ret == -1&& errno == EINTR); > > if (ret< 0) { > migrate_fd_error(s); > @@ -97,7 +97,7 @@ int unix_start_outgoing_migration(MigrationState *s, const char *path) > do { > ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr)); > if (ret == -1) > - ret = -(s->get_error(s)); > + ret = -errno; > > if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) > qemu_set_fd_handler2(s->fd, NULL, NULL, unix_wait_for_connect, s); > @@ -130,7 +130,7 @@ static void unix_accept_incoming_migration(void *opaque) > > do { > c = qemu_accept(s, (struct sockaddr *)&addr,&addrlen); > - } while (c == -1&& socket_error() == EINTR); > + } while (c == -1&& errno == EINTR); > > DPRINTF("accepted migration\n"); >