diff options
| author | Juan Quintela <quintela@redhat.com> | 2020-01-22 16:04:53 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2020-01-29 11:28:59 +0100 |
| commit | 99f2c6fb46d9df44aa13ec043d807505ae4b5559 (patch) | |
| tree | dfa49346dc6afd55226a93b67b998054a4443602 /migration/ram.c | |
| parent | 67a4c8910c7351114f2bffe6b0eceac6ad9c72af (diff) | |
| download | qemu-99f2c6fb46d9df44aa13ec043d807505ae4b5559.zip qemu-99f2c6fb46d9df44aa13ec043d807505ae4b5559.tar.gz qemu-99f2c6fb46d9df44aa13ec043d807505ae4b5559.tar.bz2 | |
multifd: multifd_send_sync_main only needs the qemufile
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration/ram.c')
| -rw-r--r-- | migration/ram.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/migration/ram.c b/migration/ram.c index ad9cc3e..152e9cf 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1082,7 +1082,7 @@ void multifd_save_cleanup(void) multifd_send_state = NULL; } -static void multifd_send_sync_main(RAMState *rs) +static void multifd_send_sync_main(QEMUFile *f) { int i; @@ -1090,7 +1090,7 @@ static void multifd_send_sync_main(RAMState *rs) return; } if (multifd_send_state->pages->used) { - if (multifd_send_pages(rs->f) < 0) { + if (multifd_send_pages(f) < 0) { error_report("%s: multifd_send_pages fail", __func__); return; } @@ -1111,7 +1111,7 @@ static void multifd_send_sync_main(RAMState *rs) p->packet_num = multifd_send_state->packet_num++; p->flags |= MULTIFD_FLAG_SYNC; p->pending_job++; - qemu_file_update_transfer(rs->f, p->packet_len); + qemu_file_update_transfer(f, p->packet_len); ram_counters.multifd_bytes += p->packet_len; ram_counters.transferred += p->packet_len; qemu_mutex_unlock(&p->mutex); @@ -3434,7 +3434,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque) ram_control_before_iterate(f, RAM_CONTROL_SETUP); ram_control_after_iterate(f, RAM_CONTROL_SETUP); - multifd_send_sync_main(*rsp); + multifd_send_sync_main(f); qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_fflush(f); @@ -3534,7 +3534,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) out: if (ret >= 0 && migration_is_setup_or_active(migrate_get_current()->state)) { - multifd_send_sync_main(rs); + multifd_send_sync_main(rs->f); qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_fflush(f); ram_counters.transferred += 8; @@ -3593,7 +3593,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque) } if (ret >= 0) { - multifd_send_sync_main(rs); + multifd_send_sync_main(rs->f); qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_fflush(f); } |