[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/7] migration-local: implementation of incoming par
From: |
Lei Li |
Subject: |
[Qemu-devel] [PATCH 5/7] migration-local: implementation of incoming part |
Date: |
Sun, 16 Jun 2013 23:37:31 +0800 |
Signed-off-by: Lei Li <address@hidden>
---
include/migration/migration.h | 6 +++++
migration-local.c | 39 ++++++++++++++++++++++++++++++++++
migration-unix.c | 47 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 92 insertions(+), 0 deletions(-)
diff --git a/include/migration/migration.h b/include/migration/migration.h
index 12c75cf..e0693c2 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -73,6 +73,10 @@ void process_incoming_migration(QEMUFile *f);
void qemu_start_incoming_migration(const char *uri, Error **errp);
+void start_local_incoming_migration(QEMUFile *f);
+
+void qemu_start_local_incoming_migration(const char *uri, Error **errp);
+
uint64_t migrate_max_downtime(void);
void do_info_migrate_print(Monitor *mon, const QObject *data);
@@ -89,6 +93,8 @@ void tcp_start_outgoing_migration(MigrationState *s, const
char *host_port, Erro
void unix_start_incoming_migration(const char *path, Error **errp);
+void unix_start_local_incoming_migration(const char *path, Error **errp);
+
void unix_start_outgoing_migration(MigrationState *s, const char *path, Error
**errp);
void unix_start_local_outgoing_migration(LocalMigState *s, const char *path,
Error **errp);
diff --git a/migration-local.c b/migration-local.c
index a97dd3a..61da76f 100644
--- a/migration-local.c
+++ b/migration-local.c
@@ -114,3 +114,42 @@ fail:
vm_start();
}
}
+
+/**********************************************************************
+ * Incoming part
+ */
+
+void qemu_start_local_incoming_migration(const char *uri, Error **errp)
+{
+ const char *p;
+
+ if (strstart(uri, "unix:", &p)) {
+ unix_start_local_incoming_migration(p, errp);
+ } else {
+ error_setg(errp, "unknown migration protocol: %s", uri);
+ }
+}
+
+void start_local_incoming_migration(QEMUFile *f)
+{
+ int ret;
+
+ ret = qemu_loadvm_state(f);
+ if (ret < 0) {
+ fprintf(stderr, "load of migration failed\n");
+ exit(EXIT_FAILURE);
+ }
+ qemu_announce_self();
+
+ DPRINTF("successfully loaded vm state\n");
+
+ bdrv_clear_incoming_migration_all();
+ /* Make sure all file formats flush their mutable metadata */
+ bdrv_invalidate_cache_all();
+
+ if (autostart) {
+ vm_start();
+ } else {
+ runstate_set(RUN_STATE_PAUSED);
+ }
+}
diff --git a/migration-unix.c b/migration-unix.c
index a21262a..ba7c0d0 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -108,3 +108,50 @@ void unix_start_incoming_migration(const char *path, Error
**errp)
qemu_set_fd_handler2(s, NULL, unix_accept_incoming_migration, NULL,
(void *)(intptr_t)s);
}
+
+static void unix_accept_local_incoming_migration(void *opaque)
+{
+ struct sockaddr_un addr;
+ socklen_t addrlen = sizeof(addr);
+ int s = (intptr_t)opaque;
+ QEMUFile *f;
+ int c;
+
+ do {
+ c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen);
+ } while (c == -1 && errno == EINTR);
+ qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
+ close(s);
+
+ DPRINTF("accepted migration\n");
+
+ if (c == -1) {
+ fprintf(stderr, "could not accept migration connection\n");
+ goto out;
+ }
+
+ f = qemu_fopen_socket(c, "rb");
+ if (f == NULL) {
+ fprintf(stderr, "could not qemu_fopen socket\n");
+ goto out;
+ }
+
+ start_local_incoming_migration(f);
+ return;
+
+out:
+ close(c);
+}
+
+void unix_start_local_incoming_migration(const char *path, Error **errp)
+{
+ int ret;
+
+ ret = unix_listen(path, NULL, 0, errp);
+ if (ret < 0) {
+ return;
+ }
+
+ qemu_set_fd_handler2(ret, NULL, unix_accept_local_incoming_migration, NULL,
+ (void *)(intptr_t)ret);
+}
--
1.7.7.6
- Re: [Qemu-devel] [PATCH 2/7] savevm: export qemu_save_device_state(), (continued)
- [Qemu-devel] [PATCH 1/7] migration: export MIG_STATE_xxx flags, Lei Li, 2013/06/16
- [Qemu-devel] [PATCH 4/7] migration-local: implementation of outgoing part, Lei Li, 2013/06/16
- [Qemu-devel] [PATCH 3/7] arch_init: add ram_madvise_free(), Lei Li, 2013/06/16
- [Qemu-devel] [PATCH 5/7] migration-local: implementation of incoming part,
Lei Li <=
- [Qemu-devel] [PATCH 6/7] migration-local: add option to command line for -incoming-local, Lei Li, 2013/06/16
- [Qemu-devel] [PATCH 7/7] hmp: add hmp_localhost_migration interface, Lei Li, 2013/06/16
- Re: [Qemu-devel] [PATCH 0/7 RFC] Localhost live migration, Anthony Liguori, 2013/06/16
- Re: [Qemu-devel] [PATCH 0/7 RFC] Localhost live migration, Stefan Hajnoczi, 2013/06/17