mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: move migration thread init code to migrate_fd_put_ready

Browse Source 
This way everything related with migration is run on the migration
thread and no locking is needed.

Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Juan Quintela 2012-07-23 05:45:29 +02:00
parent edfa1af52f
commit 766bd1769e
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/migration/migration.h
View File

@ -46,6 +46,7 @@ struct MigrationState
bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; bool enabled_capabilities[MIGRATION_CAPABILITY_MAX];
int64_t xbzrle_cache_size; int64_t xbzrle_cache_size;
bool complete; bool complete;
bool first_time;
}; };
void process_incoming_migration(QEMUFile *f); void process_incoming_migration(QEMUFile *f);

29
migration.c
View File

@ -21,6 +21,7 @@
#include "block/block.h" #include "block/block.h"
#include "qemu/sockets.h" #include "qemu/sockets.h"
#include "migration/block.h" #include "migration/block.h"
#include "qemu/thread.h"
#include "qmp-commands.h" #include "qmp-commands.h"
//#define DEBUG_MIGRATION //#define DEBUG_MIGRATION
@ -339,6 +340,16 @@ void migrate_fd_put_ready(MigrationState *s)
DPRINTF("put_ready returning because of non-active state\n"); DPRINTF("put_ready returning because of non-active state\n");
return; return;
} }
if (s->first_time) {
s->first_time = false;
DPRINTF("beginning savevm\n");
ret = qemu_savevm_state_begin(s->file, &s->params);
if (ret < 0) {
DPRINTF("failed, %d\n", ret);
migrate_fd_error(s);
return;
}
}
DPRINTF("iterate\n"); DPRINTF("iterate\n");
ret = qemu_savevm_state_iterate(s->file); ret = qemu_savevm_state_iterate(s->file);
@ -351,7 +362,11 @@ void migrate_fd_put_ready(MigrationState *s)
DPRINTF("done iterating\n"); DPRINTF("done iterating\n");
start_time = qemu_get_clock_ms(rt_clock); start_time = qemu_get_clock_ms(rt_clock);
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); if (old_vm_running) {
vm_stop(RUN_STATE_FINISH_MIGRATE);
} else {
vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
}
if (qemu_savevm_state_complete(s->file) < 0) { if (qemu_savevm_state_complete(s->file) < 0) {
migrate_fd_error(s); migrate_fd_error(s);
@ -445,19 +460,9 @@ bool migration_has_failed(MigrationState *s)
void migrate_fd_connect(MigrationState *s) void migrate_fd_connect(MigrationState *s)
{ {
int ret;
s->state = MIG_STATE_ACTIVE; s->state = MIG_STATE_ACTIVE;
s->first_time = true;
qemu_fopen_ops_buffered(s); qemu_fopen_ops_buffered(s);
DPRINTF("beginning savevm\n");
ret = qemu_savevm_state_begin(s->file, &s->params);
if (ret < 0) {
DPRINTF("failed, %d\n", ret);
migrate_fd_error(s);
return;
}
migrate_fd_put_ready(s);
} }
static MigrationState *migrate_init(const MigrationParams *params) static MigrationState *migrate_init(const MigrationParams *params)