diff options
| author | Juan Quintela <quintela@redhat.com> | 2018-02-19 19:01:03 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2018-05-15 20:24:27 +0200 |
| commit | 71bb07dbfcd465236738ee4b1cde6b80989e94bf (patch) | |
| tree | 47e1b54c114cb6fe847dd3773bc47daac37b252e /migration | |
| parent | 7a169d745c854bb722a978c63d1f9edb05f04cd6 (diff) | |
migration: Introduce multifd_recv_new_channel()
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/migration.c | 3 | ||||
| -rw-r--r-- | migration/ram.c | 6 | ||||
| -rw-r--r-- | migration/ram.h | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/migration/migration.c b/migration/migration.c index 35f2781b03..4a7959c111 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -449,8 +449,9 @@ void migration_ioc_process_incoming(QIOChannel *ioc) if (!mis->from_src_file) { QEMUFile *f = qemu_fopen_channel_input(ioc); migration_fd_process_incoming(f); + return; } - /* We still only have a single channel. Nothing to do here yet */ + multifd_recv_new_channel(ioc); } /** diff --git a/migration/ram.c b/migration/ram.c index 4d8be30676..826172c342 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -36,6 +36,7 @@ #include "xbzrle.h" #include "ram.h" #include "migration.h" +#include "socket.h" #include "migration/register.h" #include "migration/misc.h" #include "qemu-file.h" @@ -654,6 +655,11 @@ int multifd_load_setup(void) return 0; } +void multifd_recv_new_channel(QIOChannel *ioc) +{ + /* nothing to do yet */ +} + /** * save_page_header: write page header to wire * diff --git a/migration/ram.h b/migration/ram.h index 5030be110a..06dbddc2a2 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -32,6 +32,7 @@ #include "qemu-common.h" #include "qapi/qapi-types-migration.h" #include "exec/cpu-common.h" +#include "io/channel.h" extern MigrationStats ram_counters; extern XBZRLECacheStats xbzrle_counters; @@ -44,6 +45,7 @@ int multifd_save_setup(void); int multifd_save_cleanup(Error **errp); int multifd_load_setup(void); int multifd_load_cleanup(Error **errp); +void multifd_recv_new_channel(QIOChannel *ioc); uint64_t ram_pagesize_summary(void); int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len); |