Message ID | 20200123115831.36842-12-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> OK, although this is a side effect of multifd_send_state being a global rather than part of RAMState which might have been cleaner. Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > migration/ram.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/migration/ram.c b/migration/ram.c > index 125c6d0f60..19caf5ed4d 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; > } > -- > 2.24.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/migration/ram.c b/migration/ram.c index 125c6d0f60..19caf5ed4d 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; }
Signed-off-by: Juan Quintela <quintela@redhat.com> --- migration/ram.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)