a7b9285033
Alias qemu-system-* man page to qemu.1 (bz #907746) Drop execute bit on service files (bz #963917) Conditionalize KSM service on host virt support (bz #963681) Split out KSM package, make it not pulled in by default
67 lines
2.1 KiB
Diff
67 lines
2.1 KiB
Diff
From b259853dce28b7a8e0efe6bfedc7850821c8c76b Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Fri, 22 Feb 2013 17:36:09 +0100
|
|
Subject: [PATCH] migration: move more error handling to migrate_fd_cleanup
|
|
|
|
The next patch will add more cases where qemu_savevm_state_cancel
|
|
needs to be called; prepare for that already, the function can be
|
|
called twice with no ill effect.
|
|
|
|
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
|
|
Reviewed-by: Juan Quintela <quintela@redhat.com>
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
(cherry picked from commit 7a2c17216cd5ae4c22844123b8e9360d517932f8)
|
|
---
|
|
migration.c | 16 ++++++++++------
|
|
1 file changed, 10 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/migration.c b/migration.c
|
|
index d601641..739e38c 100644
|
|
--- a/migration.c
|
|
+++ b/migration.c
|
|
@@ -260,7 +260,7 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
|
|
|
|
/* shared migration helpers */
|
|
|
|
-static int migrate_fd_cleanup(MigrationState *s)
|
|
+static void migrate_fd_cleanup(MigrationState *s)
|
|
{
|
|
int ret = 0;
|
|
|
|
@@ -271,7 +271,13 @@ static int migrate_fd_cleanup(MigrationState *s)
|
|
}
|
|
|
|
assert(s->fd == -1);
|
|
- return ret;
|
|
+ if (ret < 0 && s->state == MIG_STATE_ACTIVE) {
|
|
+ s->state = MIG_STATE_ERROR;
|
|
+ }
|
|
+
|
|
+ if (s->state != MIG_STATE_ACTIVE) {
|
|
+ qemu_savevm_state_cancel();
|
|
+ }
|
|
}
|
|
|
|
void migrate_fd_error(MigrationState *s)
|
|
@@ -285,9 +291,8 @@ void migrate_fd_error(MigrationState *s)
|
|
static void migrate_fd_completed(MigrationState *s)
|
|
{
|
|
DPRINTF("setting completed state\n");
|
|
- if (migrate_fd_cleanup(s) < 0) {
|
|
- s->state = MIG_STATE_ERROR;
|
|
- } else {
|
|
+ migrate_fd_cleanup(s);
|
|
+ if (s->state == MIG_STATE_ACTIVE) {
|
|
s->state = MIG_STATE_COMPLETED;
|
|
runstate_set(RUN_STATE_POSTMIGRATE);
|
|
}
|
|
@@ -322,7 +327,6 @@ static void migrate_fd_cancel(MigrationState *s)
|
|
|
|
s->state = MIG_STATE_CANCELLED;
|
|
notifier_list_notify(&migration_state_notifiers, s);
|
|
- qemu_savevm_state_cancel();
|
|
|
|
migrate_fd_cleanup(s);
|
|
}
|