[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 23/36] migration: Refactor and simplify error checki
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 23/36] migration: Refactor and simplify error checking in migrate_fd_put_ready |
Date: |
Tue, 11 Oct 2011 12:00:43 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
migration.c | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/migration.c b/migration.c
index a01bf4f..432afe6 100644
--- a/migration.c
+++ b/migration.c
@@ -372,23 +372,22 @@ static void migrate_fd_put_ready(void *opaque)
DPRINTF("done iterating\n");
vm_stop(RUN_STATE_FINISH_MIGRATE);
- if ((qemu_savevm_state_complete(s->mon, s->file)) < 0) {
- if (old_vm_running) {
- vm_start();
+ if (qemu_savevm_state_complete(s->mon, s->file) < 0) {
+ migrate_fd_error(s);
+ } else {
+ if (migrate_fd_cleanup(s) < 0) {
+ migrate_fd_error(s);
+ } else {
+ s->state = MIG_STATE_COMPLETED;
+ runstate_set(RUN_STATE_POSTMIGRATE);
+ notifier_list_notify(&migration_state_notifiers, NULL);
}
- s->state = MIG_STATE_ERROR;
}
- if (migrate_fd_cleanup(s) < 0) {
+ if (s->get_status(s) != MIG_STATE_COMPLETED) {
if (old_vm_running) {
vm_start();
}
- s->state = MIG_STATE_ERROR;
}
- if (s->state == MIG_STATE_ACTIVE) {
- s->state = MIG_STATE_COMPLETED;
- runstate_set(RUN_STATE_POSTMIGRATE);
- }
- notifier_list_notify(&migration_state_notifiers, NULL);
}
}
--
1.7.6.4
- [Qemu-devel] [PATCH 15/36] migration: Make *start_outgoing_migration return FdMigrationState, (continued)
- [Qemu-devel] [PATCH 15/36] migration: Make *start_outgoing_migration return FdMigrationState, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 20/36] migration: Make all posible migration functions static, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 21/36] migration: move migrate_new to do_migrate, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 19/36] migration: Refactor MigrationState creation, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 22/36] migration: Introduce MIG_STATE_SETUP, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 23/36] migration: Refactor and simplify error checking in migrate_fd_put_ready,
Juan Quintela <=
- [Qemu-devel] [PATCH 24/36] migration: Introduce migrate_fd_completed() for consistency, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 28/36] migration: Move exported functions to the end of the file, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 30/36] migration: Use bandwidth_limit directly, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 29/36] migration: create accessor for current_migration, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 31/36] migration: Pass MigrationState in migration notifiers, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 34/36] migration: Don't use callback on file defining it, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 35/36] migration: propagate error correctly, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 36/36] migration: make migration-{tcp, unix} consistent, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 17/36] migration: Fold MigrationState into FdMigrationState, Juan Quintela, 2011/10/11