diff options
| author | Juan Quintela <quintela@redhat.com> | 2012-07-23 05:45:29 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2012-12-20 23:09:25 +0100 |
| commit | 766bd1769e70835e0cc25f3f057f101619494b59 (patch) | |
| tree | 18bf29401371ddf7abcec579e589079b6aafe095 | |
| parent | edfa1af52f4c69264c5a0c38da10eb372077fba3 (diff) | |
migration: move migration thread init code to migrate_fd_put_ready
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>
| -rw-r--r-- | include/migration/migration.h | 1 | ||||
| -rw-r--r-- | migration.c | 29 |
2 files changed, 18 insertions, 12 deletions
diff --git a/include/migration/migration.h b/include/migration/migration.h index fa1fb8f4cd..0ce3720112 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -46,6 +46,7 @@ struct MigrationState bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; int64_t xbzrle_cache_size; bool complete; + bool first_time; }; void process_incoming_migration(QEMUFile *f); diff --git a/migration.c b/migration.c index 5450c3b3e7..249eea389d 100644 --- a/migration.c +++ b/migration.c @@ -21,6 +21,7 @@ #include "block/block.h" #include "qemu/sockets.h" #include "migration/block.h" +#include "qemu/thread.h" #include "qmp-commands.h" //#define DEBUG_MIGRATION @@ -339,6 +340,16 @@ void migrate_fd_put_ready(MigrationState *s) DPRINTF("put_ready returning because of non-active state\n"); 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"); ret = qemu_savevm_state_iterate(s->file); @@ -351,7 +362,11 @@ void migrate_fd_put_ready(MigrationState *s) DPRINTF("done iterating\n"); start_time = qemu_get_clock_ms(rt_clock); 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) { migrate_fd_error(s); @@ -445,19 +460,9 @@ bool migration_has_failed(MigrationState *s) void migrate_fd_connect(MigrationState *s) { - int ret; - s->state = MIG_STATE_ACTIVE; + s->first_time = true; 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) |