diff options
| author | Juan Quintela <quintela@redhat.com> | 2020-01-22 16:01:09 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2020-01-29 11:28:59 +0100 |
| commit | df94d32bb14faa0a329782b5354fe0ab5b1e1ef5 (patch) | |
| tree | 8bc8c2d290f1673715d1d801510c02ef5181e4cd | |
| parent | 41aa4e9fd847a2145d336406d1cf7bbb7aa8803a (diff) | |
| download | qemu-df94d32bb14faa0a329782b5354fe0ab5b1e1ef5.zip qemu-df94d32bb14faa0a329782b5354fe0ab5b1e1ef5.tar.gz qemu-df94d32bb14faa0a329782b5354fe0ab5b1e1ef5.tar.bz2 | |
multifd: multifd_send_pages only needs the qemufile
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
| -rw-r--r-- | migration/ram.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/migration/ram.c b/migration/ram.c index 82c7edb..602e9ca 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -929,7 +929,7 @@ struct { * false. */ -static int multifd_send_pages(RAMState *rs) +static int multifd_send_pages(QEMUFile *f) { int i; static int next_channel; @@ -965,7 +965,7 @@ static int multifd_send_pages(RAMState *rs) multifd_send_state->pages = p->pages; p->pages = pages; 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.transferred += transferred;; 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; } @@ -1090,7 +1090,7 @@ static void multifd_send_sync_main(RAMState *rs) return; } 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__); return; } |