| Message ID | 20200123115831.36842-14-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Multifd Migration Compression | expand |
* Juan Quintela (quintela@redhat.com) wrote: > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > migration/ram.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/migration/ram.c b/migration/ram.c > index d4c829bc77..2783dc60f4 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); > @@ -3426,7 +3426,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); > > @@ -3526,7 +3526,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; > @@ -3585,7 +3585,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); > } > -- > 2.24.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/migration/ram.c b/migration/ram.c index d4c829bc77..2783dc60f4 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); @@ -3426,7 +3426,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); @@ -3526,7 +3526,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; @@ -3585,7 +3585,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); }
Signed-off-by: Juan Quintela <quintela@redhat.com> --- migration/ram.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)