From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 3 Jul 2018 05:58:48 +0000 (+0200)
Subject: qemu: snapshot: Audit actual disk snapshot creation
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=936ef573f1621751ea2e317ddb031e6537064911;p=libvirt.git

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 abc175ec82..0ef252d71b 100644
--- 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: