Re: [PATCH v2 03/22] migration/block-dirty-bitmap: rename dirty_bitmap_mig_cleanup

[Vladimir Sementsov-Ogievskiy]

18.02.2020 14:00, Andrey Shinkevich wrote:
> On 17/02/2020 18:02, Vladimir Sementsov-Ogievskiy wrote:
> > Rename dirty_bitmap_mig_cleanup to dirty_bitmap_do_save_cleanup, to
> > stress that it is on save part.
> >
> > Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
> > ---
> >   migration/block-dirty-bitmap.c | 8 ++++----
> >   1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
> > index 73792ab005..4e8959ae52 100644
> > --- a/migration/block-dirty-bitmap.c
> > +++ b/migration/block-dirty-bitmap.c
> > @@ -259,7 +259,7 @@ static void send_bitmap_bits(QEMUFile *f, SaveBitmapState 
> > *dbms,
> >   }
> >   /* Called with iothread lock taken.  */
> > -static void dirty_bitmap_mig_cleanup(void)
> > +static void dirty_bitmap_do_save_cleanup(void)
> >   {
> >       SaveBitmapState *dbms;
> > @@ -338,7 +338,7 @@ static int init_dirty_bitmap_migration(void)
> >       return 0;
> >   fail:
> > -    dirty_bitmap_mig_cleanup();
> > +    dirty_bitmap_do_save_cleanup();
> >       return -1;
> >   }
> > @@ -377,7 +377,7 @@ static void bulk_phase(QEMUFile *f, bool limit)
> >   /* for SaveVMHandlers */
> >   static void dirty_bitmap_save_cleanup(void *opaque)
> >   {
> > -    dirty_bitmap_mig_cleanup();
> > +    dirty_bitmap_do_save_cleanup();
> >   }
> >   static int dirty_bitmap_save_iterate(QEMUFile *f, void *opaque)
> > @@ -412,7 +412,7 @@ static int dirty_bitmap_save_complete(QEMUFile *f, void 
> > *opaque)
> >       trace_dirty_bitmap_save_complete_finish();
> > -    dirty_bitmap_mig_cleanup();
> > +    dirty_bitmap_do_save_cleanup();
> >       return 0;
> >   }
>
> At the next opportunity, I would suggest the name like
> "dirty_bitmap_do_clean_after_saving()"
> and similar for dirty_bitmap_save_cleanup()
> "dirty_bitmap_clean_after_saving()".

I'd keep my naming, it corresponds to .save_cleanup handler name.

> Reviewed-by: Andrey Shinkevich <address@hidden>


--
Best regards,
Vladimir