mirror of https://github.com/xemu-project/xemu.git
savevm: Refactor cancel operation in its own operation
Intead of abusing stage with value -1. Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
parent
226aa6a9b1
commit
9b5bfab05f
11
arch_init.c
11
arch_init.c
|
@ -296,6 +296,11 @@ static void migration_end(void)
|
||||||
memory_global_dirty_log_stop();
|
memory_global_dirty_log_stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void ram_migration_cancel(void *opaque)
|
||||||
|
{
|
||||||
|
migration_end();
|
||||||
|
}
|
||||||
|
|
||||||
#define MAX_WAIT 50 /* ms, half buffered_file limit */
|
#define MAX_WAIT 50 /* ms, half buffered_file limit */
|
||||||
|
|
||||||
static int ram_save_live(QEMUFile *f, int stage, void *opaque)
|
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 ret;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (stage < 0) {
|
|
||||||
migration_end();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
memory_global_sync_dirty_bitmap(get_system_memory());
|
memory_global_sync_dirty_bitmap(get_system_memory());
|
||||||
|
|
||||||
if (stage == 1) {
|
if (stage == 1) {
|
||||||
|
@ -537,6 +537,7 @@ done:
|
||||||
SaveVMHandlers savevm_ram_handlers = {
|
SaveVMHandlers savevm_ram_handlers = {
|
||||||
.save_live_state = ram_save_live,
|
.save_live_state = ram_save_live,
|
||||||
.load_state = ram_load,
|
.load_state = ram_load,
|
||||||
|
.cancel = ram_migration_cancel,
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef HAS_AUDIO
|
#ifdef HAS_AUDIO
|
||||||
|
|
|
@ -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)
|
static int block_save_live(QEMUFile *f, int stage, void *opaque)
|
||||||
{
|
{
|
||||||
int ret;
|
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",
|
DPRINTF("Enter save live stage %d submitted %d transferred %d\n",
|
||||||
stage, block_mig_state.submitted, block_mig_state.transferred);
|
stage, block_mig_state.submitted, block_mig_state.transferred);
|
||||||
|
|
||||||
if (stage < 0) {
|
|
||||||
blk_mig_cleanup();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (block_mig_state.blk_enable != 1) {
|
if (block_mig_state.blk_enable != 1) {
|
||||||
/* no need to migrate storage */
|
/* no need to migrate storage */
|
||||||
|
@ -713,6 +714,7 @@ SaveVMHandlers savevm_block_handlers = {
|
||||||
.set_params = block_set_params,
|
.set_params = block_set_params,
|
||||||
.save_live_state = block_save_live,
|
.save_live_state = block_save_live,
|
||||||
.load_state = block_load,
|
.load_state = block_load,
|
||||||
|
.cancel = block_migration_cancel,
|
||||||
};
|
};
|
||||||
|
|
||||||
void blk_mig_init(void)
|
void blk_mig_init(void)
|
||||||
|
|
4
savevm.c
4
savevm.c
|
@ -1703,8 +1703,8 @@ void qemu_savevm_state_cancel(QEMUFile *f)
|
||||||
SaveStateEntry *se;
|
SaveStateEntry *se;
|
||||||
|
|
||||||
QTAILQ_FOREACH(se, &savevm_handlers, entry) {
|
QTAILQ_FOREACH(se, &savevm_handlers, entry) {
|
||||||
if (se->ops && se->ops->save_live_state) {
|
if (se->ops && se->ops->cancel) {
|
||||||
se->ops->save_live_state(f, -1, se->opaque);
|
se->ops->cancel(se->opaque);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,6 +33,7 @@ typedef struct SaveVMHandlers {
|
||||||
void (*set_params)(const MigrationParams *params, void * opaque);
|
void (*set_params)(const MigrationParams *params, void * opaque);
|
||||||
SaveStateHandler *save_state;
|
SaveStateHandler *save_state;
|
||||||
int (*save_live_state)(QEMUFile *f, int stage, void *opaque);
|
int (*save_live_state)(QEMUFile *f, int stage, void *opaque);
|
||||||
|
void (*cancel)(void *opaque);
|
||||||
LoadStateHandler *load_state;
|
LoadStateHandler *load_state;
|
||||||
} SaveVMHandlers;
|
} SaveVMHandlers;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue