On Wed, Feb 05, 2025 at 05:57:09PM +0530, Prasad Pandit wrote: > From: Prasad Pandit <p...@fedoraproject.org> > > Refactor ram_save_target_page legacy and multifd > functions into one. Other than simplifying it, > it frees 'migration_ops' object from usage, so it > is expunged. > > Reviewed-by: Fabiano Rosas <faro...@suse.de> > Signed-off-by: Prasad Pandit <p...@fedoraproject.org>
Reviewed-by: Peter Xu <pet...@redhat.com> One nitpick below: [...] > -static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss) > +static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss) > { > ram_addr_t offset = ((ram_addr_t)pss->page) << TARGET_PAGE_BITS; > int res; > > + if (!migrate_multifd() > + || migrate_zero_page_detection() == ZERO_PAGE_DETECTION_LEGACY) { > + if (save_zero_page(rs, pss, offset)) { > + return 1; > + } > + } > + > + if (migrate_multifd()) { > + RAMBlock *block = pss->block; > + return ram_save_multifd_page(block, offset); Can drop the var here : return ram_save_multifd_page(pss->block, offset); -- Peter Xu