qemu: snapshot: Audit actual disk snapshot creation

Currently we'd audit that we managed to format the data for the
'transaction' command rather than the (un)successful attempt to create
the snapshot.

Move the auditing code so that it can actually audit the result of the
'transaction' command.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index abc175ec820ff1379323f35f6e9eb58aba810a39..0ef252d71bffff9c30529b3674a9ebe0ded73ce6 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -14939,7 +14939,7 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver,
     char *device = NULL;
     char *source = NULL;
     const char *formatStr = NULL;
-    int ret = -1, rc;
+    int ret = -1;
 
     if (!(device = qemuAliasDiskDriveFromDisk(dd->disk)))
         goto cleanup;
@@ -14967,9 +14967,8 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver,
 
     formatStr = virStorageFileFormatTypeToString(dd->src->format);
 
-    ret = rc = qemuMonitorDiskSnapshot(priv->mon, actions, device, source,
-                                       formatStr, reuse);
-    virDomainAuditDisk(vm, dd->disk->src, dd->src, "snapshot", rc >= 0);
+    ret = qemuMonitorDiskSnapshot(priv->mon, actions, device, source,
+                                  formatStr, reuse);
 
  cleanup:
     VIR_FREE(device);
@@ -15034,10 +15033,8 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
 
         ret = qemuMonitorTransaction(priv->mon, &actions);
 
-        if (qemuDomainObjExitMonitor(driver, vm) < 0 || ret < 0) {
+        if (qemuDomainObjExitMonitor(driver, vm) < 0)
             ret = -1;
-            goto error;
-        }
 
         for (i = 0; i < snap->def->ndisks; i++) {
             qemuDomainSnapshotDiskDataPtr dd = &diskdata[i];
@@ -15045,8 +15042,14 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
             if (!dd->src)
                 continue;
 
-            qemuDomainSnapshotUpdateDiskSources(dd, &persist);
+            virDomainAuditDisk(vm, dd->disk->src, dd->src, "snapshot", ret >= 0);
+
+            if (ret == 0)
+                qemuDomainSnapshotUpdateDiskSources(dd, &persist);
         }
+
+        if (ret < 0)
+            goto error;
     }
 
  error: