* Juan Quintela (quint...@redhat.com) wrote: > We are going to create a new function for multifd latest in the series. ^^ 'later'
Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com> > > Signed-off-by: Juan Quintela <quint...@redhat.com> > --- > migration/ram.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/migration/ram.c b/migration/ram.c > index e9dcd3ca4e..3536778e19 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -294,6 +294,9 @@ struct RAMSrcPageRequest { > QSIMPLEQ_ENTRY(RAMSrcPageRequest) next_req; > }; > > +typedef struct RAMState RAMState; > +typedef struct PageSearchStatus PageSearchStatus; > + > /* State of RAM for migration */ > struct RAMState { > /* QEMUFile used for this migration */ > @@ -348,8 +351,8 @@ struct RAMState { > /* Queue of outstanding page requests from the destination */ > QemuMutex src_page_req_mutex; > QSIMPLEQ_HEAD(, RAMSrcPageRequest) src_page_requests; > + int (*ram_save_target_page)(RAMState *rs, PageSearchStatus *pss); > }; > -typedef struct RAMState RAMState; > > static RAMState *ram_state; > > @@ -2117,14 +2120,14 @@ static bool save_compress_page(RAMState *rs, RAMBlock > *block, ram_addr_t offset) > } > > /** > - * ram_save_target_page: save one target page > + * ram_save_target_page_legacy: save one target page > * > * Returns the number of pages written > * > * @rs: current RAM state > * @pss: data about the page we want to send > */ > -static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss) > +static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss) > { > RAMBlock *block = pss->block; > ram_addr_t offset = ((ram_addr_t)pss->page) << TARGET_PAGE_BITS; > @@ -2200,7 +2203,7 @@ static int ram_save_host_page(RAMState *rs, > PageSearchStatus *pss) > do { > /* Check the pages is dirty and if it is send it */ > if (migration_bitmap_clear_dirty(rs, pss->block, pss->page)) { > - tmppages = ram_save_target_page(rs, pss); > + tmppages = rs->ram_save_target_page(rs, pss); > if (tmppages < 0) { > return tmppages; > } > @@ -3008,6 +3011,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); > > + (*rsp)->ram_save_target_page = ram_save_target_page_legacy; > multifd_send_sync_main(f); > qemu_put_be64(f, RAM_SAVE_FLAG_EOS); > qemu_fflush(f); > -- > 2.34.1 > -- Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK