From: Pavel Hrdina <phrdina@redhat.com>
Date: Thu, 11 Nov 2021 16:39:54 +0000 (+0100)
Subject: test: snapshot revert: drop unused code
X-Git-Tag: v7.10.0-rc1~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74ea062be6b328f859fc6232fc2e6bdc3e970d64;p=thirdparty%2Flibvirt.git

test: snapshot revert: drop unused code

Now that we always emulate VM process stop we can drop the unused code
and simply the logic.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index a76b207c0e..e21a23ebb7 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -9082,35 +9082,18 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
                                                       VIR_DOMAIN_EVENT_STOPPED,
                                                       VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT);
             virObjectEventStateQueue(privconn->eventState, event);
-            goto load;
-
-            if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) {
-                /* Transitions 5, 6 */
-                was_running = true;
-                virDomainObjSetState(vm, VIR_DOMAIN_PAUSED,
-                                     VIR_DOMAIN_PAUSED_FROM_SNAPSHOT);
-                /* Create an event now in case the restore fails, so
-                 * that user will be alerted that they are now paused.
-                 * If restore later succeeds, we might replace this. */
-                event = virDomainEventLifecycleNewFromObj(vm,
-                                VIR_DOMAIN_EVENT_SUSPENDED,
-                                VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT);
-            }
-            virDomainObjAssignDef(vm, config, false, NULL);
-
-        } else {
-            /* Transitions 2, 3 */
-        load:
-            was_stopped = true;
-            virDomainObjAssignDef(vm, config, false, NULL);
-            if (testDomainStartState(privconn, vm,
-                                VIR_DOMAIN_RUNNING_FROM_SNAPSHOT) < 0)
-                goto cleanup;
-            event = virDomainEventLifecycleNewFromObj(vm,
-                                VIR_DOMAIN_EVENT_STARTED,
-                                VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT);
         }
 
+        was_stopped = true;
+
+        virDomainObjAssignDef(vm, config, false, NULL);
+        if (testDomainStartState(privconn, vm,
+                            VIR_DOMAIN_RUNNING_FROM_SNAPSHOT) < 0)
+            goto cleanup;
+        event = virDomainEventLifecycleNewFromObj(vm,
+                            VIR_DOMAIN_EVENT_STARTED,
+                            VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT);
+
         /* Touch up domain state.  */
         if (!(flags & VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING) &&
             (snapdef->state == VIR_DOMAIN_SNAPSHOT_PAUSED ||