We are still sending the page through the main channel, that would change later in the series
Signed-off-by: Juan Quintela <quint...@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com> --- migration/ram.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 5d6b46ac23..19c8089c4b 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1191,6 +1191,7 @@ static int ram_multifd_page(RAMState *rs, PageSearchStatus *pss, bool last_stage) { int pages; + uint16_t fd_num; uint8_t *p; RAMBlock *block = pss->block; ram_addr_t offset = pss->page << TARGET_PAGE_BITS; @@ -1202,7 +1203,10 @@ static int ram_multifd_page(RAMState *rs, PageSearchStatus *pss, ram_counters.transferred += save_page_header(rs, rs->f, block, offset | RAM_SAVE_FLAG_MULTIFD_PAGE); - multifd_send_page(block, offset, rs->migration_dirty_pages == 1); + fd_num = multifd_send_page(block, offset, + rs->migration_dirty_pages == 1); + qemu_put_be16(rs->f, fd_num); + ram_counters.transferred += 2; /* size of fd_num */ qemu_put_buffer(rs->f, p, TARGET_PAGE_SIZE); ram_counters.transferred += TARGET_PAGE_SIZE; pages = 1; @@ -3040,6 +3044,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) while (!postcopy_running && !ret && !(flags & RAM_SAVE_FLAG_EOS)) { ram_addr_t addr, total_ram_bytes; void *host = NULL; + uint16_t fd_num; uint8_t ch; addr = qemu_get_be64(f); @@ -3151,6 +3156,11 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) break; case RAM_SAVE_FLAG_MULTIFD_PAGE: + fd_num = qemu_get_be16(f); + if (fd_num != 0) { + /* this is yet an unused variable, changed later */ + fd_num = fd_num; + } qemu_get_buffer(f, host, TARGET_PAGE_SIZE); break; -- 2.14.3