mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multifd: multifd_send_pages only needs the qemufile

Browse Source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela 2020-01-22 16:01:09 +01:00
parent 41aa4e9fd8
commit df94d32bb1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
migration/ram.c
View File

@ -929,7 +929,7 @@ struct {
* false. * false.
*/ */
static int multifd_send_pages(RAMState *rs) static int multifd_send_pages(QEMUFile *f)
{ {
int i; int i;
static int next_channel; static int next_channel;
@ -965,7 +965,7 @@ static int multifd_send_pages(RAMState *rs)
multifd_send_state->pages = p->pages; multifd_send_state->pages = p->pages;
p->pages = pages; p->pages = pages;
transferred = ((uint64_t) pages->used) * TARGET_PAGE_SIZE + p->packet_len; transferred = ((uint64_t) pages->used) * TARGET_PAGE_SIZE + p->packet_len;
qemu_file_update_transfer(rs->f, transferred); qemu_file_update_transfer(f, transferred);
ram_counters.multifd_bytes += transferred; ram_counters.multifd_bytes += transferred;
ram_counters.transferred += transferred;; ram_counters.transferred += transferred;;
qemu_mutex_unlock(&p->mutex); qemu_mutex_unlock(&p->mutex);
@ -993,7 +993,7 @@ static int multifd_queue_page(RAMState *rs, RAMBlock *block, ram_addr_t offset)
} }
} }
if (multifd_send_pages(rs) < 0) { if (multifd_send_pages(rs->f) < 0) {
return -1; return -1;
} }
@ -1090,7 +1090,7 @@ static void multifd_send_sync_main(RAMState *rs)
return; return;
} }
if (multifd_send_state->pages->used) { if (multifd_send_state->pages->used) {
if (multifd_send_pages(rs) < 0) { if (multifd_send_pages(rs->f) < 0) {
error_report("%s: multifd_send_pages fail", __func__); error_report("%s: multifd_send_pages fail", __func__);
return; return;
} }