From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmKym-0008Gd-Ew for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:07:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmKyd-00081a-JC for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:07:20 -0500 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:48140) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmKyc-00081I-NS for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:07:11 -0500 Received: from /spool/local by e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 29 Nov 2013 20:07:08 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 478A12CE8051 for ; Fri, 29 Nov 2013 21:07:07 +1100 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rAT9n9t762324760 for ; Fri, 29 Nov 2013 20:49:09 +1100 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rATA764D012741 for ; Fri, 29 Nov 2013 21:07:06 +1100 From: Lei Li Date: Fri, 29 Nov 2013 18:06:20 +0800 Message-Id: <1385719584-21114-14-git-send-email-lilei@linux.vnet.ibm.com> In-Reply-To: <1385719584-21114-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1385719584-21114-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, 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