Re: [Qemu-devel] [PATCH v2 2/5] migration: Rename cleanup() to save_cleanup()

[Dr. David Alan Gilbert]

* Juan Quintela (address@hidden) wrote:
> We need a cleanup for loads, so we rename here to be consistent.
> 
> Signed-off-by: Juan Quintela <address@hidden>
> ---
>  hw/ppc/spapr.c               | 2 +-
>  include/migration/register.h | 2 +-
>  migration/block.c            | 2 +-
>  migration/ram.c              | 2 +-
>  migration/savevm.c           | 4 ++--
>  5 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 7db5396..dabf822 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -1871,7 +1871,7 @@ static SaveVMHandlers savevm_htab_handlers = {
>      .save_setup = htab_save_setup,
>      .save_live_iterate = htab_save_iterate,
>      .save_live_complete_precopy = htab_save_complete,
> -    .cleanup = htab_cleanup,
> +    .save_cleanup = htab_cleanup,
>      .load_state = htab_load,

It might make sense to follow the rename through so that those
become htab_save_cleanup.

However, only minor.


Reviewed-by: Dr. David Alan Gilbert <address@hidden>

>  };
>  
> diff --git a/include/migration/register.h b/include/migration/register.h
> index 333e3df..9ad1e4c 100644
> --- a/include/migration/register.h
> +++ b/include/migration/register.h
> @@ -21,7 +21,7 @@ typedef struct SaveVMHandlers {
>      /* This runs inside the iothread lock.  */
>      SaveStateHandler *save_state;
>  
> -    void (*cleanup)(void *opaque);
> +    void (*save_cleanup)(void *opaque);
>      int (*save_live_complete_postcopy)(QEMUFile *f, void *opaque);
>      int (*save_live_complete_precopy)(QEMUFile *f, void *opaque);
>  
> diff --git a/migration/block.c b/migration/block.c
> index c160d41..ad36afb 100644
> --- a/migration/block.c
> +++ b/migration/block.c
> @@ -1012,7 +1012,7 @@ static SaveVMHandlers savevm_block_handlers = {
>      .save_live_complete_precopy = block_save_complete,
>      .save_live_pending = block_save_pending,
>      .load_state = block_load,
> -    .cleanup = block_migration_cleanup,
> +    .save_cleanup = block_migration_cleanup,
>      .is_active = block_is_active,
>  };
>  
> diff --git a/migration/ram.c b/migration/ram.c
> index 3454bf7..be78e42 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -2611,7 +2611,7 @@ static SaveVMHandlers savevm_ram_handlers = {
>      .save_live_complete_precopy = ram_save_complete,
>      .save_live_pending = ram_save_pending,
>      .load_state = ram_load,
> -    .cleanup = ram_migration_cleanup,
> +    .save_cleanup = ram_migration_cleanup,
>  };
>  
>  void ram_mig_init(void)
> diff --git a/migration/savevm.c b/migration/savevm.c
> index 7f2a5bd..fb93931 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -1226,8 +1226,8 @@ void qemu_savevm_state_cleanup(void)
>  
>      trace_savevm_state_cleanup();
>      QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
> -        if (se->ops && se->ops->cleanup) {
> -            se->ops->cleanup(se->opaque);
> +        if (se->ops && se->ops->save_cleanup) {
> +            se->ops->save_cleanup(se->opaque);
>          }
>      }
>  }
> -- 
> 2.9.4
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK