diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-10 08:21:46 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-10 08:21:46 -0500 |
commit | ebffe2afceb1a17b5d134b5debf553955fe5ea1a (patch) | |
tree | 223ee0630a56a8d1410d5ad283996486ec434ab7 /migration.c | |
parent | 057643f6c4751651ab640edb9b445cb3816edffc (diff) | |
parent | 5bc465e4b1b6f4582a400c0a7033a1c841744278 (diff) |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
Diffstat (limited to 'migration.c')
-rw-r--r-- | migration.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/migration.c b/migration.c index 7dd8f4eee9..77a51adc5b 100644 --- a/migration.c +++ b/migration.c @@ -73,7 +73,7 @@ void process_incoming_migration(QEMUFile *f) if (autostart) { vm_start(); } else { - runstate_set(RSTATE_PRE_LAUNCH); + runstate_set(RUN_STATE_PRELAUNCH); } } @@ -375,7 +375,7 @@ void migrate_fd_put_ready(void *opaque) int old_vm_running = runstate_is_running(); DPRINTF("done iterating\n"); - vm_stop(RSTATE_PRE_MIGRATE); + vm_stop(RUN_STATE_FINISH_MIGRATE); if ((qemu_savevm_state_complete(s->mon, s->file)) < 0) { if (old_vm_running) { @@ -392,7 +392,7 @@ void migrate_fd_put_ready(void *opaque) state = MIG_STATE_ERROR; } if (state == MIG_STATE_COMPLETED) { - runstate_set(RSTATE_POST_MIGRATE); + runstate_set(RUN_STATE_POSTMIGRATE); } s->state = state; notifier_list_notify(&migration_state_notifiers, NULL); |