From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40548) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjQJd-0007dI-O4 for qemu-devel@nongnu.org; Thu, 21 Nov 2013 04:12:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VjQJU-0003bf-D0 for qemu-devel@nongnu.org; Thu, 21 Nov 2013 04:12:49 -0500 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:43279) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjQJT-0003ZV-Jj for qemu-devel@nongnu.org; Thu, 21 Nov 2013 04:12:40 -0500 Received: from /spool/local by e28smtp07.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 21 Nov 2013 14:42:37 +0530 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 51AF03940057 for ; Thu, 21 Nov 2013 14:42:35 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rAL9CMM426804346 for ; Thu, 21 Nov 2013 14:42:22 +0530 Received: from d28av03.in.ibm.com (localhost [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rAL9CR9c032225 for ; Thu, 21 Nov 2013 14:42:28 +0530 From: Lei Li Date: Thu, 21 Nov 2013 17:11:36 +0800 Message-Id: <1385025100-3191-14-git-send-email-lilei@linux.vnet.ibm.com> In-Reply-To: <1385025100-3191-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1385025100-3191-1-git-send-email-lilei@linux.vnet.ibm.com> Subject: [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: qemu-devel@nongnu.org Cc: aarcange@redhat.com, Lei Li , quintela@redhat.com, mdroth@linux.vnet.ibm.com, mrhines@linux.vnet.ibm.com, aliguori@amazon.com, lagarcia@br.ibm.com, pbonzini@redhat.com, rcj@linux.vnet.ibm.com 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..9beeafe 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 fail; } 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) { + fprintf(stderr, "failed to open Unix socket\n"); + 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, "failed to open Unix socket\n"); goto out; } -- 1.7.7.6