Re: [Qemu-devel] [PATCH v2 1/5] migration: Rename save_live_setup() to save_setup()

[Dr. David Alan Gilbert]

* Juan Quintela (address@hidden) wrote:
> We are going to use it now for more than save live regions.
> Once there rename qemu_savevm_state_begin() to qemu_savevm_state_setup().
> 
> Signed-off-by: Juan Quintela <address@hidden>

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

> ---
>  hw/ppc/spapr.c               |  2 +-
>  include/migration/register.h |  2 +-
>  migration/block.c            |  2 +-
>  migration/colo.c             |  2 +-
>  migration/migration.c        |  2 +-
>  migration/ram.c              |  2 +-
>  migration/savevm.c           | 12 ++++++------
>  migration/savevm.h           |  2 +-
>  migration/trace-events       |  2 +-
>  9 files changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index dcd44a1..7db5396 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -1868,7 +1868,7 @@ static void htab_cleanup(void *opaque)
>  }
>  
>  static SaveVMHandlers savevm_htab_handlers = {
> -    .save_live_setup = htab_save_setup,
> +    .save_setup = htab_save_setup,
>      .save_live_iterate = htab_save_iterate,
>      .save_live_complete_precopy = htab_save_complete,
>      .cleanup = htab_cleanup,
> diff --git a/include/migration/register.h b/include/migration/register.h
> index 717c617..333e3df 100644
> --- a/include/migration/register.h
> +++ b/include/migration/register.h
> @@ -36,7 +36,7 @@ typedef struct SaveVMHandlers {
>      int (*save_live_iterate)(QEMUFile *f, void *opaque);
>  
>      /* This runs outside the iothread lock!  */
> -    int (*save_live_setup)(QEMUFile *f, void *opaque);
> +    int (*save_setup)(QEMUFile *f, void *opaque);
>      void (*save_live_pending)(QEMUFile *f, void *opaque,
>                                uint64_t threshold_size,
>                                uint64_t *non_postcopiable_pending,
> diff --git a/migration/block.c b/migration/block.c
> index 3aae5a3..c160d41 100644
> --- a/migration/block.c
> +++ b/migration/block.c
> @@ -1007,7 +1007,7 @@ static bool block_is_active(void *opaque)
>  }
>  
>  static SaveVMHandlers savevm_block_handlers = {
> -    .save_live_setup = block_save_setup,
> +    .save_setup = block_save_setup,
>      .save_live_iterate = block_save_iterate,
>      .save_live_complete_precopy = block_save_complete,
>      .save_live_pending = block_save_pending,
> diff --git a/migration/colo.c b/migration/colo.c
> index c436d63..8bc1690 100644
> --- a/migration/colo.c
> +++ b/migration/colo.c
> @@ -350,7 +350,7 @@ static int colo_do_checkpoint_transaction(MigrationState 
> *s,
>      /* Disable block migration */
>      migrate_set_block_enabled(false, &local_err);
>      qemu_savevm_state_header(fb);
> -    qemu_savevm_state_begin(fb);
> +    qemu_savevm_state_setup(fb);
>      qemu_mutex_lock_iothread();
>      qemu_savevm_state_complete_precopy(fb, false);
>      qemu_mutex_unlock_iothread();
> diff --git a/migration/migration.c b/migration/migration.c
> index 52dac9d..0799424 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -1825,7 +1825,7 @@ static void *migration_thread(void *opaque)
>          qemu_savevm_send_postcopy_advise(s->to_dst_file);
>      }
>  
> -    qemu_savevm_state_begin(s->to_dst_file);
> +    qemu_savevm_state_setup(s->to_dst_file);
>  
>      s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_HOST) - setup_start;
>      migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
> diff --git a/migration/ram.c b/migration/ram.c
> index 7f687f5..3454bf7 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -2605,7 +2605,7 @@ static int ram_load(QEMUFile *f, void *opaque, int 
> version_id)
>  }
>  
>  static SaveVMHandlers savevm_ram_handlers = {
> -    .save_live_setup = ram_save_setup,
> +    .save_setup = ram_save_setup,
>      .save_live_iterate = ram_save_iterate,
>      .save_live_complete_postcopy = ram_save_complete,
>      .save_live_complete_precopy = ram_save_complete,
> diff --git a/migration/savevm.c b/migration/savevm.c
> index f32a82d..7f2a5bd 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -606,7 +606,7 @@ int register_savevm_live(DeviceState *dev,
>      se->opaque = opaque;
>      se->vmsd = NULL;
>      /* if this is a live_savem then set is_ram */
> -    if (ops->save_live_setup != NULL) {
> +    if (ops->save_setup != NULL) {
>          se->is_ram = 1;
>      }
>  
> @@ -977,14 +977,14 @@ void qemu_savevm_state_header(QEMUFile *f)
>  
>  }
>  
> -void qemu_savevm_state_begin(QEMUFile *f)
> +void qemu_savevm_state_setup(QEMUFile *f)
>  {
>      SaveStateEntry *se;
>      int ret;
>  
> -    trace_savevm_state_begin();
> +    trace_savevm_state_setup();
>      QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
> -        if (!se->ops || !se->ops->save_live_setup) {
> +        if (!se->ops || !se->ops->save_setup) {
>              continue;
>          }
>          if (se->ops && se->ops->is_active) {
> @@ -994,7 +994,7 @@ void qemu_savevm_state_begin(QEMUFile *f)
>          }
>          save_section_header(f, se, QEMU_VM_SECTION_START);
>  
> -        ret = se->ops->save_live_setup(f, se->opaque);
> +        ret = se->ops->save_setup(f, se->opaque);
>          save_section_footer(f, se);
>          if (ret < 0) {
>              qemu_file_set_error(f, ret);
> @@ -1252,7 +1252,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
>  
>      qemu_mutex_unlock_iothread();
>      qemu_savevm_state_header(f);
> -    qemu_savevm_state_begin(f);
> +    qemu_savevm_state_setup(f);
>      qemu_mutex_lock_iothread();
>  
>      while (qemu_file_get_error(f) == 0) {
> diff --git a/migration/savevm.h b/migration/savevm.h
> index 45b59c1..54ce8f6 100644
> --- a/migration/savevm.h
> +++ b/migration/savevm.h
> @@ -30,7 +30,7 @@
>  #define QEMU_VM_SECTION_FOOTER       0x7e
>  
>  bool qemu_savevm_state_blocked(Error **errp);
> -void qemu_savevm_state_begin(QEMUFile *f);
> +void qemu_savevm_state_setup(QEMUFile *f);
>  void qemu_savevm_state_header(QEMUFile *f);
>  int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy);
>  void qemu_savevm_state_cleanup(void);
> diff --git a/migration/trace-events b/migration/trace-events
> index 38345be..9669e94 100644
> --- a/migration/trace-events
> +++ b/migration/trace-events
> @@ -32,7 +32,7 @@ savevm_send_open_return_path(void) ""
>  savevm_send_ping(uint32_t val) "%x"
>  savevm_send_postcopy_listen(void) ""
>  savevm_send_postcopy_run(void) ""
> -savevm_state_begin(void) ""
> +savevm_state_setup(void) ""
>  savevm_state_header(void) ""
>  savevm_state_iterate(void) ""
>  savevm_state_cleanup(void) ""
> -- 
> 2.9.4
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK