migration: Rename cleanup() to save_cleanup()

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

Signed-off-by: Juan Quintela <[email protected]>
Reviewed-by: Dr. David Alan Gilbert <[email protected]>
--

Rename htab_cleanup to htap_save_cleanup as dave suggestion
Message-Id: <20170628095228[email protected]>
Signed-off-by: Dr. David Alan Gilbert <[email protected]>

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index ba87be5d488466084d7289909bedfd55ea58bfad..990772b6336b6620e8e1c414ecec37c374444bb2 100644 (file)
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -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,
 };
 

diff --git a/include/migration/register.h b/include/migration/register.h
index f607769e834d775c4fa176fe6dcc38c3a161cb41..938ea2bc3d1b4b8ecc95be37d6717734655adede 100644 (file)
--- a/include/migration/register.h
+++ b/include/migration/register.h
@@ -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);
 

diff --git a/migration/block.c b/migration/block.c
index 7a7e83a26860a3190c4b214a96e25365933a4ff7..9171f600287508b5f8d0e3ffc8049a5cc3c51db7 100644 (file)
--- a/migration/block.c
+++ b/migration/block.c
@@ -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,
 };
 

diff --git a/migration/ram.c b/migration/ram.c
index 480248a00f07f8b5c909c02a84075790af0f0a53..649f76cb525d39e32fd5ebb24d039318b1f5e6a0 100644 (file)
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -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)

diff --git a/migration/savevm.c b/migration/savevm.c
index 66f816040e7d887148d8e9bdcee99d3a2e53e95e..fee11c5d28477c06bd4a35f49705434419b7fa5f 100644 (file)
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -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);
         }
     }
 }