Commit 9907e842 authored by Juan Quintela's avatar Juan Quintela Committed by Dr. David Alan Gilbert
Browse files

migration: Rename save_live_setup() to save_setup() 



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: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20170628095228.4661-2-quintela@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent c8d3ff38

hw/ppc/spapr.c

+1 −1
Original line number Diff line number Diff line
@@ -1953,7 +1953,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,

include/migration/register.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,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,

migration/block.c

+1 −1
Original line number Diff line number Diff line
@@ -1008,7 +1008,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,

migration/colo.c

+1 −1
Original line number Diff line number Diff line
@@ -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, false);

    qemu_mutex_unlock_iothread();

migration/migration.c

+1 −1
Original line number Diff line number Diff line
@@ -1835,7 +1835,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,