qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Lei Li <lilei@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: aarcange@redhat.com, Lei Li <lilei@linux.vnet.ibm.com>,
	quintela@redhat.com, mrhines@linux.vnet.ibm.com,
	aliguori@amazon.com, lagarcia@br.ibm.com, pbonzini@redhat.com,
	rcj@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH 13/17] migration-unix: replace qemu_fopen_socket with qemu_fopen_socket_local
Date: Mon,  2 Dec 2013 17:19:13 +0800	[thread overview]
Message-ID: <1385975957-22941-14-git-send-email-lilei@linux.vnet.ibm.com> (raw)
In-Reply-To: <1385975957-22941-1-git-send-email-lilei@linux.vnet.ibm.com>

Replace qemu_fopen_socket with qemu_fopen_socket_local in Unix
protocol migration.

Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
---
 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

  parent reply	other threads:[~2013-12-02  9:20 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-02  9:19 [Qemu-devel] [PATCH 0/17 v5] Localhost migration with side channel for ram Lei Li
2013-12-02  9:19 ` [Qemu-devel] [PATCH 01/17] QAPI: introduce migration capability x_unix_page_flipping Lei Li
2014-03-03 23:42   ` Eric Blake
2013-12-02  9:19 ` [Qemu-devel] [PATCH 02/17] migration: add migrate_unix_page_flipping() Lei Li
2013-12-02  9:19 ` [Qemu-devel] [PATCH 03/17] qmp-command.hx: add missing docs for migration capabilites Lei Li
2013-12-02  9:19 ` [Qemu-devel] [PATCH 04/17] migration-local: add QEMUFileLocal with socket based QEMUFile Lei Li
2013-12-02  9:19 ` [Qemu-devel] [PATCH 05/17] migration-local: introduce qemu_fopen_socket_local() Lei Li
2013-12-02  9:19 ` [Qemu-devel] [PATCH 06/17] migration-local: add send_pipefd() Lei Li
2013-12-02  9:33   ` Daniel P. Berrange
2013-12-03 11:19     ` Lei Li
2013-12-03 11:35       ` Daniel P. Berrange
2013-12-03 14:21         ` Lei Li
2013-12-03 11:52       ` Paolo Bonzini
2013-12-03 14:23         ` Lei Li
2013-12-02  9:19 ` [Qemu-devel] [PATCH 07/17] save_page: replace block_offset with a MemoryRegion Lei Li
2013-12-27  5:48   ` Michael R. Hines
2013-12-02  9:19 ` [Qemu-devel] [PATCH 08/17] migration-local: override save_page for page transmit Lei Li
2013-12-02  9:19 ` [Qemu-devel] [PATCH 09/17] savevm: adjust ram_control_save_page for page flipping Lei Li
2013-12-02  9:19 ` [Qemu-devel] [PATCH 10/17] add unix_msgfd_lookup() to callback get_buffer Lei Li
2013-12-02  9:19 ` [Qemu-devel] [PATCH 11/17] add argument ram_addr_t to hook_ram_load Lei Li
2013-12-27  5:49   ` Michael R. Hines
2013-12-02  9:19 ` [Qemu-devel] [PATCH 12/17] migration-local: override hook_ram_load Lei Li
2013-12-02  9:19 ` Lei Li [this message]
2013-12-02  9:19 ` [Qemu-devel] [PATCH 14/17] add new RunState RUN_STATE_MEMORY_STALE Lei Li
2013-12-02  9:19 ` [Qemu-devel] [PATCH 15/17] migration-unix: page flipping support on unix outgoing Lei Li
2013-12-02  9:19 ` [Qemu-devel] [PATCH 16/17] migration: adjust migration_thread() process for page flipping Lei Li
2013-12-02  9:19 ` [Qemu-devel] [PATCH 17/17] hmp: better format for info migrate_capabilities Lei Li
2013-12-03 11:58 ` [Qemu-devel] [PATCH 0/17 v5] Localhost migration with side channel for ram Paolo Bonzini
  -- strict thread matches above, loose matches on Subject: below --
2013-11-29 10:06 [Qemu-devel] [PATCH 0/17 v4] " Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 13/17] migration-unix: replace qemu_fopen_socket with qemu_fopen_socket_local Lei Li
2013-11-21  9:11 [Qemu-devel] [PATCH 0/17 v3] Localhost migration with side channel for ram Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 13/17] migration-unix: replace qemu_fopen_socket with qemu_fopen_socket_local Lei Li
2013-10-22  3:25 [Qemu-devel] [PATCH 0/17 v2] Localhost migration with side channel for ram Lei Li
2013-10-22  3:25 ` [Qemu-devel] [PATCH 13/17] migration-unix: replace qemu_fopen_socket with qemu_fopen_socket_local Lei Li
2013-10-24 14:10   ` Paolo Bonzini
2013-10-25  4:18     ` Lei Li

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1385975957-22941-14-git-send-email-lilei@linux.vnet.ibm.com \
    --to=lilei@linux.vnet.ibm.com \
    --cc=aarcange@redhat.com \
    --cc=aliguori@amazon.com \
    --cc=lagarcia@br.ibm.com \
    --cc=mrhines@linux.vnet.ibm.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=rcj@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).