[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/9] migration: Rename cleanup() to save_cleanup()
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 6/9] migration: Rename cleanup() to save_cleanup() |
Date: |
Mon, 10 Jul 2017 18:10:37 +0100 |
From: Juan Quintela <address@hidden>
We need a cleanup for loads, so we rename here to be consistent.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
--
Rename htab_cleanup to htap_save_cleanup as dave suggestion
Message-Id: <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
hw/ppc/spapr.c | 4 ++--
include/migration/register.h | 2 +-
migration/block.c | 2 +-
migration/ram.c | 2 +-
migration/savevm.c | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index ba87be5d48..990772b633 100644
--- 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 f607769e83..938ea2bc3d 100644
--- 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 7a7e83a268..9171f60028 100644
--- 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 480248a00f..649f76cb52 100644
--- 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 66f816040e..fee11c5d28 100644
--- 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);
}
}
}
--
2.13.0
- [Qemu-devel] [PULL 0/9] migration queue, Dr. David Alan Gilbert (git), 2017/07/10
- [Qemu-devel] [PULL 2/9] vl: move global property, migrate init earlier, Dr. David Alan Gilbert (git), 2017/07/10
- [Qemu-devel] [PULL 1/9] migration: fix handling for --only-migratable, Dr. David Alan Gilbert (git), 2017/07/10
- [Qemu-devel] [PULL 3/9] doc: add item for "-M enforce-config-section", Dr. David Alan Gilbert (git), 2017/07/10
- [Qemu-devel] [PULL 4/9] doc: update TYPE_MIGRATION documents, Dr. David Alan Gilbert (git), 2017/07/10
- [Qemu-devel] [PULL 5/9] migration: Rename save_live_setup() to save_setup(), Dr. David Alan Gilbert (git), 2017/07/10
- [Qemu-devel] [PULL 6/9] migration: Rename cleanup() to save_cleanup(),
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 8/9] migration: Convert ram to use new load_setup()/load_cleanup(), Dr. David Alan Gilbert (git), 2017/07/10
- [Qemu-devel] [PULL 7/9] migration: Create load_setup()/cleanup() methods, Dr. David Alan Gilbert (git), 2017/07/10
- [Qemu-devel] [PULL 9/9] migration: Make compression_threads use save/load_setup/cleanup(), Dr. David Alan Gilbert (git), 2017/07/10
- Re: [Qemu-devel] [PULL 0/9] migration queue, Peter Maydell, 2017/07/11