[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/28] migration: Refactor and simplify error checki
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 10/28] migration: Refactor and simplify error checking in migrate_fd_put_ready |
Date: |
Wed, 23 Feb 2011 22:47:19 +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 45cc263..ed6e626 100644
--- a/migration.c
+++ b/migration.c
@@ -363,28 +363,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 v2 00/28] Refactor and cleanup migration code, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 01/28] migration: Make *start_outgoing_migration return FdMigrationState, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 02/28] migration: Use FdMigrationState instead of MigrationState when possible, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 04/28] migration: Rename FdMigrationState MigrationState, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 10/28] migration: Refactor and simplify error checking in migrate_fd_put_ready,
Juan Quintela <=
- [Qemu-devel] [PATCH 09/28] migration: Introduce MIG_STATE_NONE, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 12/28] migration: Our release callback was just free, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 13/28] migration: Remove get_status() accessor, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 14/28] migration: Remove migration cancel() callback, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 08/28] migration: Check that migration is active before cancel it, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 06/28] migration: Make all posible migration functions static, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 03/28] migration: Fold MigrationState into FdMigrationState, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 16/28] migration: use global variable directly, Juan Quintela, 2011/02/23