SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

multifd: multifd_send_sync_main 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:04:53 +01:00
parent 67a4c8910c
commit 99f2c6fb46
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
migration/ram.c
View File

@ -1082,7 +1082,7 @@ void multifd_save_cleanup(void)
multifd_send_state = NULL; multifd_send_state = NULL;
} }
static void multifd_send_sync_main(RAMState *rs) static void multifd_send_sync_main(QEMUFile *f)
{ {
int i; int i;
@ -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->f) < 0) { if (multifd_send_pages(f) < 0) {
error_report("%s: multifd_send_pages fail", __func__); error_report("%s: multifd_send_pages fail", __func__);
return; return;
} }
@ -1111,7 +1111,7 @@ static void multifd_send_sync_main(RAMState *rs)
p->packet_num = multifd_send_state->packet_num++; p->packet_num = multifd_send_state->packet_num++;
p->flags |= MULTIFD_FLAG_SYNC; p->flags |= MULTIFD_FLAG_SYNC;
p->pending_job++; 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.multifd_bytes += p->packet_len;
ram_counters.transferred += p->packet_len; ram_counters.transferred += p->packet_len;
qemu_mutex_unlock(&p->mutex); 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_before_iterate(f, RAM_CONTROL_SETUP);
ram_control_after_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_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f); qemu_fflush(f);
@ -3534,7 +3534,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
out: out:
if (ret >= 0 if (ret >= 0
&& migration_is_setup_or_active(migrate_get_current()->state)) { && 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_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f); qemu_fflush(f);
ram_counters.transferred += 8; ram_counters.transferred += 8;
@ -3593,7 +3593,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
} }
if (ret >= 0) { if (ret >= 0) {
multifd_send_sync_main(rs); multifd_send_sync_main(rs->f);
qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f); qemu_fflush(f);
} }