From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50680) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZYrX-0005wp-Kc for qemu-devel@nongnu.org; Fri, 25 Oct 2013 00:19:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VZYrO-00052R-O6 for qemu-devel@nongnu.org; Fri, 25 Oct 2013 00:19:03 -0400 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:57069) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZYrO-00052N-2W for qemu-devel@nongnu.org; Fri, 25 Oct 2013 00:18:54 -0400 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 25 Oct 2013 09:48:50 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 9676C1258017 for ; Fri, 25 Oct 2013 09:49:22 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r9P4LkIk38731790 for ; Fri, 25 Oct 2013 09:51:46 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r9P4Ikg8013135 for ; Fri, 25 Oct 2013 09:48:47 +0530 Message-ID: <5269F124.3050107@linux.vnet.ibm.com> Date: Fri, 25 Oct 2013 12:18:44 +0800 From: Lei Li MIME-Version: 1.0 References: <1382412341-1173-1-git-send-email-lilei@linux.vnet.ibm.com> <1382412341-1173-14-git-send-email-lilei@linux.vnet.ibm.com> <52692A4E.6000909@redhat.com> In-Reply-To: <52692A4E.6000909@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 13/17] migration-unix: replace qemu_fopen_socket with qemu_fopen_socket_local List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: aarcange@redhat.com, quintela@redhat.com, mdroth@linux.vnet.ibm.com, mrhines@linux.vnet.ibm.com, qemu-devel@nongnu.org, Anthony Liguori , lagarcia@br.ibm.com, rcj@linux.vnet.ibm.com On 10/24/2013 10:10 PM, Paolo Bonzini wrote: > Il 22/10/2013 04:25, Lei Li ha scritto: >> Relace qemu_fopen_socket with qemu_fopen_socket_local in Unix >> protocol migration. >> >> Signed-off-by: Lei Li >> --- >> migration-unix.c | 18 ++++++++++++++---- >> 1 files changed, 14 insertions(+), 4 deletions(-) >> >> diff --git a/migration-unix.c b/migration-unix.c >> index 651fc5b..d3a151a 100644 >> --- a/migration-unix.c >> +++ b/migration-unix.c >> @@ -37,12 +37,22 @@ static void unix_wait_for_connect(int fd, void *opaque) >> if (fd < 0) { >> DPRINTF("migrate connect error\n"); >> s->file = NULL; >> - migrate_fd_error(s); >> + goto fails; >> } else { >> DPRINTF("migrate connect success\n"); >> - s->file = qemu_fopen_socket(fd, "wb"); >> + >> + s->file = qemu_fopen_socket_local(fd, "wb"); >> + if (s->file == NULL) { >> + DPRINTF("failed to open local socket\n"); > "failed to open Unix socket" OK. > >> + goto fail; >> + } >> + >> migrate_fd_connect(s); >> + return; >> } >> + >> +fail: >> + migrate_fd_error(s); >> } >> >> void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp) >> @@ -71,9 +81,9 @@ static void unix_accept_incoming_migration(void *opaque) >> goto out; >> } >> >> - f = qemu_fopen_socket(c, "rb"); >> + f = qemu_fopen_socket_local(c, "rb"); >> if (f == NULL) { >> - fprintf(stderr, "could not qemu_fopen socket\n"); >> + fprintf(stderr, "could not qemu_fopen socket local\n"); > "failed to open Unix socket" OK, thanks. > >> goto out; >> } >> >> > Otherwise ok. > > Paolo > -- Lei