[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/22] migration: Refactor and simplify error checki
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 10/22] migration: Refactor and simplify error checking in migrate_fd_put_ready |
Date: |
Wed, 23 Feb 2011 01:44:24 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
migration.c | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/migration.c b/migration.c
index f015e02..641df9f 100644
--- a/migration.c
+++ b/migration.c
@@ -361,28 +361,26 @@ static void migrate_fd_put_ready(void *opaque)
DPRINTF("iterate\n");
if (qemu_savevm_state_iterate(s->mon, s->file) == 1) {
- int state;
int old_vm_running = vm_running;
DPRINTF("done iterating\n");
vm_stop(VMSTOP_MIGRATE);
- if ((qemu_savevm_state_complete(s->mon, s->file)) < 0) {
- if (old_vm_running) {
- vm_start();
- }
- state = MIG_STATE_ERROR;
+ if (qemu_savevm_state_complete(s->mon, s->file) < 0) {
+ migrate_fd_error(s);
} else {
- state = MIG_STATE_COMPLETED;
+ if (migrate_fd_cleanup(s) < 0) {
+ migrate_fd_error(s);
+ } else {
+ s->state = MIG_STATE_COMPLETED;
+ notifier_list_notify(&migration_state_notifiers);
+ }
}
- if (migrate_fd_cleanup(s) < 0) {
+ if (s->get_status(s) != MIG_STATE_COMPLETED) {
if (old_vm_running) {
vm_start();
}
- state = MIG_STATE_ERROR;
}
- s->state = state;
- notifier_list_notify(&migration_state_notifiers);
}
}
--
1.7.4
- [Qemu-devel] [PATCH 04/22] migration: Rename FdMigrationState MigrationState, (continued)
- [Qemu-devel] [PATCH 04/22] migration: Rename FdMigrationState MigrationState, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 05/22] migration: Refactor MigrationState creation, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 06/22] migration: Make all posible migration functions static, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 08/22] migration: Check that migration is active before cancel it, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 09/22] migration: Introduce MIG_STATE_NONE, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 07/22] migration: move migrate_create_state to do_migrate, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 10/22] migration: Refactor and simplify error checking in migrate_fd_put_ready,
Juan Quintela <=
- [Qemu-devel] [PATCH 11/22] migration: Introduce migrate_fd_completed() for consistenncy, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 12/22] migration: Use migrate_fd_error() in last place that set status to ERROR, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 13/22] migration: Our release callback was just free, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 15/22] migration: Remove migration cancel() callback, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 14/22] migration: Remove get_status() accessor, Juan Quintela, 2011/02/22