[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/5] migration: Rename cleanup() to save_cleanup()
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 2/5] migration: Rename cleanup() to save_cleanup() |
Date: |
Fri, 2 Jun 2017 00:15:49 +0200 |
We need a cleanup for loads.
Signed-off-by: Juan Quintela <address@hidden>
---
hw/ppc/spapr.c | 2 +-
include/migration/register.h | 2 +-
migration/block.c | 2 +-
migration/ram.c | 2 +-
migration/savevm.c | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index d51a361..0c11613 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1876,7 +1876,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_cleanup,
.load_state = htab_load,
};
diff --git a/include/migration/register.h b/include/migration/register.h
index 6cb27f4..8e37185 100644
--- a/include/migration/register.h
+++ b/include/migration/register.h
@@ -21,7 +21,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 976c42e..efa0805 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -1000,7 +1000,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 f2c13e2..d3d2ef1 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2603,7 +2603,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 67c9c39..0ec2cb0 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1242,8 +1242,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.9.4
- [Qemu-devel] [PATCH 0/5] Create setup/cleanup methods for migration incoming side, Juan Quintela, 2017/06/01
- [Qemu-devel] [PATCH 1/5] migration: Rename save_live_setup() to save_setup(), Juan Quintela, 2017/06/01
- [Qemu-devel] [PATCH 2/5] migration: Rename cleanup() to save_cleanup(),
Juan Quintela <=
- [Qemu-devel] [PATCH 3/5] migration: Create load_setup()/cleanup() methods, Juan Quintela, 2017/06/01
- [Qemu-devel] [PATCH 4/5] migration: Convert ram to use new load_setup()/load_cleanup(), Juan Quintela, 2017/06/01
- [Qemu-devel] [PATCH 5/5] migration: Make compression_threads use save/load_setup/cleanup(), Juan Quintela, 2017/06/01
- Re: [Qemu-devel] [PATCH 0/5] Create setup/cleanup methods for migration incoming side, Juan Quintela, 2017/06/07