| Message ID | 1485207141-1941-14-git-send-email-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
* Juan Quintela (quintela@redhat.com) wrote: > We are still sending the page through the main channel, that would > change later in the series > > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > migration/ram.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/migration/ram.c b/migration/ram.c > index 1267730..ca94704 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -566,7 +566,7 @@ static int multifd_send_page(uint8_t *address) > qemu_cond_signal(&multifd_send[i].cond); > qemu_mutex_unlock(&multifd_send[i].mutex); > > - return 0; > + return i; > } > > struct MultiFDRecvParams { > @@ -1083,6 +1083,7 @@ static int ram_multifd_page(QEMUFile *f, PageSearchStatus *pss, > bool last_stage, uint64_t *bytes_transferred) > { > int pages; > + uint16_t fd_num; > uint8_t *p; > RAMBlock *block = pss->block; > ram_addr_t offset = pss->offset; > @@ -1096,8 +1097,10 @@ static int ram_multifd_page(QEMUFile *f, PageSearchStatus *pss, > if (pages == -1) { > *bytes_transferred += > save_page_header(f, block, offset | RAM_SAVE_FLAG_MULTIFD_PAGE); > + fd_num = multifd_send_page(p); > + qemu_put_be16(f, fd_num); > + *bytes_transferred += 2; /* size of fd_num */ > qemu_put_buffer(f, p, TARGET_PAGE_SIZE); > - multifd_send_page(p); > *bytes_transferred += TARGET_PAGE_SIZE; > pages = 1; > acct_info.norm_pages++; > @@ -2815,6 +2818,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) > while (!postcopy_running && !ret && !(flags & RAM_SAVE_FLAG_EOS)) { > ram_addr_t addr, total_ram_bytes; > void *host = NULL; > + uint16_t fd_num; > uint8_t ch; > > addr = qemu_get_be64(f); > @@ -2915,6 +2919,11 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) > break; > > case RAM_SAVE_FLAG_MULTIFD_PAGE: > + fd_num = qemu_get_be16(f); > + if (fd_num != 0) { > + /* this is yet an unused variable, changed later */ > + fd_num = fd_num; > + } > qemu_get_buffer(f, host, TARGET_PAGE_SIZE); > break; > > -- > 2.9.3 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/migration/ram.c b/migration/ram.c index 1267730..ca94704 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -566,7 +566,7 @@ static int multifd_send_page(uint8_t *address) qemu_cond_signal(&multifd_send[i].cond); qemu_mutex_unlock(&multifd_send[i].mutex); - return 0; + return i; } struct MultiFDRecvParams { @@ -1083,6 +1083,7 @@ static int ram_multifd_page(QEMUFile *f, PageSearchStatus *pss, bool last_stage, uint64_t *bytes_transferred) { int pages; + uint16_t fd_num; uint8_t *p; RAMBlock *block = pss->block; ram_addr_t offset = pss->offset; @@ -1096,8 +1097,10 @@ static int ram_multifd_page(QEMUFile *f, PageSearchStatus *pss, if (pages == -1) { *bytes_transferred += save_page_header(f, block, offset | RAM_SAVE_FLAG_MULTIFD_PAGE); + fd_num = multifd_send_page(p); + qemu_put_be16(f, fd_num); + *bytes_transferred += 2; /* size of fd_num */ qemu_put_buffer(f, p, TARGET_PAGE_SIZE); - multifd_send_page(p); *bytes_transferred += TARGET_PAGE_SIZE; pages = 1; acct_info.norm_pages++; @@ -2815,6 +2818,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) while (!postcopy_running && !ret && !(flags & RAM_SAVE_FLAG_EOS)) { ram_addr_t addr, total_ram_bytes; void *host = NULL; + uint16_t fd_num; uint8_t ch; addr = qemu_get_be64(f); @@ -2915,6 +2919,11 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) break; case RAM_SAVE_FLAG_MULTIFD_PAGE: + fd_num = qemu_get_be16(f); + if (fd_num != 0) { + /* this is yet an unused variable, changed later */ + fd_num = fd_num; + } qemu_get_buffer(f, host, TARGET_PAGE_SIZE); break;
We are still sending the page through the main channel, that would change later in the series Signed-off-by: Juan Quintela <quintela@redhat.com> --- migration/ram.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)