[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/12] savevm: Refactor cancel operation in its own
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 05/12] savevm: Refactor cancel operation in its own operation |
Date: |
Thu, 28 Jun 2012 21:22:03 +0200 |
Intead of abusing stage with value -1.
Signed-off-by: Juan Quintela <address@hidden>
---
arch_init.c | 11 ++++++-----
block-migration.c | 10 ++++++----
savevm.c | 4 ++--
vmstate.h | 1 +
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 0b7e31f..36e19b0 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -296,6 +296,11 @@ static void migration_end(void)
memory_global_dirty_log_stop();
}
+static void ram_migration_cancel(void *opaque)
+{
+ migration_end();
+}
+
#define MAX_WAIT 50 /* ms, half buffered_file limit */
static int ram_save_live(QEMUFile *f, int stage, void *opaque)
@@ -306,11 +311,6 @@ static int ram_save_live(QEMUFile *f, int stage, void
*opaque)
int ret;
int i;
- if (stage < 0) {
- migration_end();
- return 0;
- }
-
memory_global_sync_dirty_bitmap(get_system_memory());
if (stage == 1) {
@@ -536,6 +536,7 @@ done:
SaveVMHandlers savevm_ram_handlers = {
.save_live_state = ram_save_live,
.load_state = ram_load,
+ .cancel = ram_migration_cancel,
};
#ifdef HAS_AUDIO
diff --git a/block-migration.c b/block-migration.c
index 00151a0..cd8a8dd 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -536,6 +536,11 @@ static void blk_mig_cleanup(void)
}
}
+static void block_migration_cancel(void *opaque)
+{
+ blk_mig_cleanup();
+}
+
static int block_save_live(QEMUFile *f, int stage, void *opaque)
{
int ret;
@@ -543,10 +548,6 @@ static int block_save_live(QEMUFile *f, int stage, void
*opaque)
DPRINTF("Enter save live stage %d submitted %d transferred %d\n",
stage, block_mig_state.submitted, block_mig_state.transferred);
- if (stage < 0) {
- blk_mig_cleanup();
- return 0;
- }
if (block_mig_state.blk_enable != 1) {
/* no need to migrate storage */
@@ -713,6 +714,7 @@ SaveVMHandlers savevm_block_handlers = {
.set_params = block_set_params,
.save_live_state = block_save_live,
.load_state = block_load,
+ .cancel = block_migration_cancel,
};
void blk_mig_init(void)
diff --git a/savevm.c b/savevm.c
index a451be2..888c5a2 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1703,8 +1703,8 @@ void qemu_savevm_state_cancel(QEMUFile *f)
SaveStateEntry *se;
QTAILQ_FOREACH(se, &savevm_handlers, entry) {
- if (se->ops && se->ops->save_live_state) {
- se->ops->save_live_state(f, -1, se->opaque);
+ if (se->ops && se->ops->cancel) {
+ se->ops->cancel(se->opaque);
}
}
}
diff --git a/vmstate.h b/vmstate.h
index 0e24834..1dd42f5 100644
--- a/vmstate.h
+++ b/vmstate.h
@@ -33,6 +33,7 @@ typedef struct SaveVMHandlers {
void (*set_params)(const MigrationParams *params, void * opaque);
SaveStateHandler *save_state;
int (*save_live_state)(QEMUFile *f, int stage, void *opaque);
+ void (*cancel)(void *opaque);
LoadStateHandler *load_state;
} SaveVMHandlers;
--
1.7.10.2
- [Qemu-devel] [PATCH 00/12] Split ram_save_live() function, Juan Quintela, 2012/06/28
- [Qemu-devel] [PATCH 01/12] savevm: Use a struct to pass all handlers, Juan Quintela, 2012/06/28
- [Qemu-devel] [PATCH 02/12] savevm: Live migration handlers register the struct directly, Juan Quintela, 2012/06/28
- [Qemu-devel] [PATCH 03/12] savevm: remove SaveSetParamsHandler, Juan Quintela, 2012/06/28
- [Qemu-devel] [PATCH 04/12] savevm: remove SaveLiveStateHandler, Juan Quintela, 2012/06/28
- [Qemu-devel] [PATCH 05/12] savevm: Refactor cancel operation in its own operation,
Juan Quintela <=
- [Qemu-devel] [PATCH 06/12] savevm: introduce is_active method, Juan Quintela, 2012/06/28
- [Qemu-devel] [PATCH 09/12] ram: save_live_setup() don't need to sent pages, Juan Quintela, 2012/06/28
- [Qemu-devel] [PATCH 08/12] savevm: split save_live into stage2 and stage3, Juan Quintela, 2012/06/28
- [Qemu-devel] [PATCH 10/12] ram: save_live_complete() only do one loop, Juan Quintela, 2012/06/28
- [Qemu-devel] [PATCH 11/12] ram: iterate phase, Juan Quintela, 2012/06/28
- [Qemu-devel] [PATCH 07/12] savevm: split save_live_setup from save_live_state, Juan Quintela, 2012/06/28
- [Qemu-devel] [PATCH 12/12] ram: save_live_setup() we don't need to synchronize the dirty bitmap., Juan Quintela, 2012/06/28