External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 12:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: snapshot: Audit actual disk snapshot creation

Browse Source 
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>
This commit is contained in:
Peter Krempa 2018-07-03 07:58:48 +02:00
parent c5dc734403
commit 936ef573f1
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu/qemu_driver.c
View File

@ -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: