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

migration: Rename cleanup() to save_cleanup() 



We need a cleanup for loads, so we rename here to be consistent.

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>

--

Rename htab_cleanup to htap_save_cleanup as dave suggestion
Message-Id: <20170628095228.4661-3-quintela@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 9907e842

hw/ppc/spapr.c

+2 −2
Original line number Diff line number Diff line
@@ -1945,7 +1945,7 @@ static int htab_load(QEMUFile *f, void *opaque, int version_id) 
    return 0;

}



static void htab_cleanup(void *opaque)

static void htab_save_cleanup(void *opaque)

{

    sPAPRMachineState *spapr = opaque;
@@ -1956,7 +1956,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_save_cleanup,

    .load_state = htab_load,

};

include/migration/register.h

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

migration/block.c

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

};

migration/ram.c

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

migration/savevm.c

+2 −2
Original line number Diff line number Diff line
@@ -1215,8 +1215,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);

        }

    }

}