haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

migration: Rename cleanup() to save_cleanup()

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

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. 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: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela 2017-06-28 11:52:25 +02:00 committed by Dr. David Alan Gilbert
parent 9907e842d7
commit 70f794fcfa
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hw/ppc/spapr.c
View file

@ -1945,7 +1945,7 @@ static int htab_load(QEMUFile *f, void *opaque, int version_id)
return 0; return 0;
} }
static void htab_cleanup(void *opaque) static void htab_save_cleanup(void *opaque)
{ {
sPAPRMachineState *spapr = opaque; sPAPRMachineState *spapr = opaque;
@ -1956,7 +1956,7 @@ static SaveVMHandlers savevm_htab_handlers = {
.save_setup = htab_save_setup, .save_setup = htab_save_setup,
.save_live_iterate = htab_save_iterate, .save_live_iterate = htab_save_iterate,
.save_live_complete_precopy = htab_save_complete, .save_live_complete_precopy = htab_save_complete,
.cleanup = htab_cleanup, .save_cleanup = htab_save_cleanup,
.load_state = htab_load, .load_state = htab_load,
}; };

2
include/migration/register.h
View file

@ -18,7 +18,7 @@ typedef struct SaveVMHandlers {
/* This runs inside the iothread lock. */ /* This runs inside the iothread lock. */
SaveStateHandler *save_state; 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_postcopy)(QEMUFile *f, void *opaque);
int (*save_live_complete_precopy)(QEMUFile *f, void *opaque); int (*save_live_complete_precopy)(QEMUFile *f, void *opaque);

2
migration/block.c
View file

@ -1013,7 +1013,7 @@ static SaveVMHandlers savevm_block_handlers = {
.save_live_complete_precopy = block_save_complete, .save_live_complete_precopy = block_save_complete,
.save_live_pending = block_save_pending, .save_live_pending = block_save_pending,
.load_state = block_load, .load_state = block_load,
.cleanup = block_migration_cleanup, .save_cleanup = block_migration_cleanup,
.is_active = block_is_active, .is_active = block_is_active,
}; };

2
migration/ram.c
View file

@ -2629,7 +2629,7 @@ static SaveVMHandlers savevm_ram_handlers = {
.save_live_complete_precopy = ram_save_complete, .save_live_complete_precopy = ram_save_complete,
.save_live_pending = ram_save_pending, .save_live_pending = ram_save_pending,
.load_state = ram_load, .load_state = ram_load,
.cleanup = ram_migration_cleanup, .save_cleanup = ram_migration_cleanup,
}; };
void ram_mig_init(void) void ram_mig_init(void)

4
migration/savevm.c
View file

@ -1215,8 +1215,8 @@ void qemu_savevm_state_cleanup(void)
trace_savevm_state_cleanup(); trace_savevm_state_cleanup();
QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
if (se->ops && se->ops->cleanup) { if (se->ops && se->ops->save_cleanup) {
se->ops->cleanup(se->opaque); se->ops->save_cleanup(se->opaque);
} }
} }
} }