| Message ID | 20230613145757.10131-19-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Migration compression cleanup | expand |
On Tue, 13 Jun 2023 16:57:57 +0200 Juan Quintela <quintela@redhat.com> wrote: > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Lukas Straub <lukasstraub2@web.de> > --- > migration/ram.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/migration/ram.c b/migration/ram.c > index 0259c33da7..ae11d0e992 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -1069,16 +1069,15 @@ void ram_release_page(const char *rbname, uint64_t offset) > * @pss: current PSS channel > * @offset: offset inside the block for the page > */ > -static int save_zero_page_to_file(PageSearchStatus *pss, QEMUFile *file, > - ram_addr_t offset) > +static int save_zero_page_to_file(PageSearchStatus *pss, ram_addr_t offset) > { > uint8_t *p = pss->block->host + offset; > int len = 0; > > if (buffer_is_zero(p, TARGET_PAGE_SIZE)) { > - len += save_page_header(pss, file, pss->block, > + len += save_page_header(pss, pss->pss_channel, pss->block, > offset | RAM_SAVE_FLAG_ZERO); > - qemu_put_byte(file, 0); > + qemu_put_byte(pss->pss_channel, 0); > len += 1; > ram_release_page(pss->block->idstr, offset); > } > @@ -1093,9 +1092,9 @@ static int save_zero_page_to_file(PageSearchStatus *pss, QEMUFile *file, > * @pss: current PSS channel > * @offset: offset inside the block for the page > */ > -static int save_zero_page(PageSearchStatus *pss, QEMUFile *f, ram_addr_t offset) > +static int save_zero_page(PageSearchStatus *pss, ram_addr_t offset) > { > - int len = save_zero_page_to_file(pss, f, offset); > + int len = save_zero_page_to_file(pss, offset); > > if (len) { > stat64_add(&mig_stats.zero_pages, 1); > @@ -2031,7 +2030,7 @@ static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss) > return 1; > } > > - res = save_zero_page(pss, pss->pss_channel, offset); > + res = save_zero_page(pss, offset); > if (res > 0) { > /* Must let xbzrle know, otherwise a previous (now 0'd) cached > * page would be stale
diff --git a/migration/ram.c b/migration/ram.c index 0259c33da7..ae11d0e992 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1069,16 +1069,15 @@ void ram_release_page(const char *rbname, uint64_t offset) * @pss: current PSS channel * @offset: offset inside the block for the page */ -static int save_zero_page_to_file(PageSearchStatus *pss, QEMUFile *file, - ram_addr_t offset) +static int save_zero_page_to_file(PageSearchStatus *pss, ram_addr_t offset) { uint8_t *p = pss->block->host + offset; int len = 0; if (buffer_is_zero(p, TARGET_PAGE_SIZE)) { - len += save_page_header(pss, file, pss->block, + len += save_page_header(pss, pss->pss_channel, pss->block, offset | RAM_SAVE_FLAG_ZERO); - qemu_put_byte(file, 0); + qemu_put_byte(pss->pss_channel, 0); len += 1; ram_release_page(pss->block->idstr, offset); } @@ -1093,9 +1092,9 @@ static int save_zero_page_to_file(PageSearchStatus *pss, QEMUFile *file, * @pss: current PSS channel * @offset: offset inside the block for the page */ -static int save_zero_page(PageSearchStatus *pss, QEMUFile *f, ram_addr_t offset) +static int save_zero_page(PageSearchStatus *pss, ram_addr_t offset) { - int len = save_zero_page_to_file(pss, f, offset); + int len = save_zero_page_to_file(pss, offset); if (len) { stat64_add(&mig_stats.zero_pages, 1); @@ -2031,7 +2030,7 @@ static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss) return 1; } - res = save_zero_page(pss, pss->pss_channel, offset); + res = save_zero_page(pss, offset); if (res > 0) { /* Must let xbzrle know, otherwise a previous (now 0'd) cached * page would be stale
Signed-off-by: Juan Quintela <quintela@redhat.com> --- migration/ram.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)