qemu_migration: Refactor qemuMigrationSrcRestoreDomainState

None of the callers really care about the return value so we can drop it
and simplify the code a bit.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 8c0e522828e1521d113ca4cfeef301ff6782a6ef..71aaa9799cc0bb001e0182bda5f1a3548b064dda 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -219,57 +219,49 @@ qemuMigrationSrcStoreDomainState(virDomainObj *vm)
               priv->preMigrationState, vm);
 }
 
-/* Returns true if the domain was resumed, false otherwise */
-static bool
+
+static void
 qemuMigrationSrcRestoreDomainState(virQEMUDriver *driver, virDomainObj *vm)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
+    virDomainState preMigrationState = priv->preMigrationState;
     int reason;
     virDomainState state = virDomainObjGetState(vm, &reason);
-    bool ret = false;
+
+    priv->preMigrationState = VIR_DOMAIN_NOSTATE;
 
     VIR_DEBUG("driver=%p, vm=%p, pre-mig-state=%s, state=%s, reason=%s",
               driver, vm,
-              virDomainStateTypeToString(priv->preMigrationState),
+              virDomainStateTypeToString(preMigrationState),
               virDomainStateTypeToString(state),
               virDomainStateReasonToString(state, reason));
 
-    if (state != VIR_DOMAIN_PAUSED ||
+    if (preMigrationState != VIR_DOMAIN_RUNNING ||
+        state != VIR_DOMAIN_PAUSED ||
         reason == VIR_DOMAIN_PAUSED_POSTCOPY_FAILED)
-        goto cleanup;
+        return;
 
-    if (priv->preMigrationState == VIR_DOMAIN_RUNNING) {
-        /* This is basically the only restore possibility that's safe
-         * and we should attempt to do */
-
-        VIR_DEBUG("Restoring pre-migration state due to migration error");
-
-        /* we got here through some sort of failure; start the domain again */
-        if (qemuProcessStartCPUs(driver, vm,
-                                 VIR_DOMAIN_RUNNING_MIGRATION_CANCELED,
-                                 VIR_ASYNC_JOB_MIGRATION_OUT) < 0) {
-            /* Hm, we already know we are in error here.  We don't want to
-             * overwrite the previous error, though, so we just throw something
-             * to the logs and hope for the best */
-            VIR_ERROR(_("Failed to resume guest %1$s after failure"), vm->def->name);
-            if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) {
-                virObjectEvent *event;
-
-                virDomainObjSetState(vm, VIR_DOMAIN_PAUSED,
-                                     VIR_DOMAIN_PAUSED_API_ERROR);
-                event = virDomainEventLifecycleNewFromObj(vm,
-                                                          VIR_DOMAIN_EVENT_SUSPENDED,
-                                                          VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR);
-                virObjectEventStateQueue(driver->domainEventState, event);
-            }
-            goto cleanup;
+    VIR_DEBUG("Restoring pre-migration state due to migration error");
+
+    /* we got here through some sort of failure; start the domain again */
+    if (qemuProcessStartCPUs(driver, vm,
+                             VIR_DOMAIN_RUNNING_MIGRATION_CANCELED,
+                             VIR_ASYNC_JOB_MIGRATION_OUT) < 0) {
+        /* Hm, we already know we are in error here.  We don't want to
+         * overwrite the previous error, though, so we just throw something
+         * to the logs and hope for the best */
+        VIR_ERROR(_("Failed to resume guest %1$s after failure"), vm->def->name);
+        if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) {
+            virObjectEvent *event;
+
+            virDomainObjSetState(vm, VIR_DOMAIN_PAUSED,
+                                 VIR_DOMAIN_PAUSED_API_ERROR);
+            event = virDomainEventLifecycleNewFromObj(vm,
+                                                      VIR_DOMAIN_EVENT_SUSPENDED,
+                                                      VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR);
+            virObjectEventStateQueue(driver->domainEventState, event);
         }
-        ret = true;
     }
-
- cleanup:
-    priv->preMigrationState = VIR_DOMAIN_NOSTATE;
-    return ret;
 }