]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
test: snapshot revert: always error out if VM XML is missing
authorPavel Hrdina <phrdina@redhat.com>
Thu, 11 Nov 2021 16:34:46 +0000 (17:34 +0100)
committerPavel Hrdina <phrdina@redhat.com>
Tue, 23 Nov 2021 10:41:52 +0000 (11:41 +0100)
We should have this check even if FORCE flag is used because later we
unconditionally copy the `snap->def->dom` and error out if there is no
copy created. The test driver will always save the VM XML when creating
new snapshot.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
src/test/test_driver.c

index d2577b2b160b6be648b8e8583a0320b9f185a258..c17ed9d2a48003abced5bdc14f41e8f72c49fe03 100644 (file)
@@ -9042,13 +9042,14 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
         goto cleanup;
     }
 
+    if (!snap->def->dom) {
+        virReportError(VIR_ERR_SNAPSHOT_REVERT_RISKY,
+                       _("snapshot '%s' lacks domain '%s' rollback info"),
+                       snap->def->name, vm->def->name);
+        goto cleanup;
+    }
+
     if (!(flags & VIR_DOMAIN_SNAPSHOT_REVERT_FORCE)) {
-        if (!snap->def->dom) {
-            virReportError(VIR_ERR_SNAPSHOT_REVERT_RISKY,
-                           _("snapshot '%s' lacks domain '%s' rollback info"),
-                           snap->def->name, vm->def->name);
-            goto cleanup;
-        }
         if (virDomainObjIsActive(vm) &&
             !(snapdef->state == VIR_DOMAIN_SNAPSHOT_RUNNING ||
               snapdef->state == VIR_DOMAIN_SNAPSHOT_PAUSED) &&