External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: snapshot: Remove unnecessary 'do_transaction' logic in qemuDomainSnapshotCreateDiskActive

Browse Source 
Now that we never get to the actual snapshot code if there's nothing to
do we can remove the variable and surrounding logic.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-06-05 15:42:39 +02:00
parent 0491128f2a
commit 143c2de113
1 changed files with 13 additions and 18 deletions

31
src/qemu/qemu_driver.c

@ -15238,7 +15238,6 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
VIR_AUTOPTR(virJSONValue) actions = NULL; VIR_AUTOPTR(virJSONValue) actions = NULL;
bool do_transaction = false;
int rc; int rc;
int ret = -1; int ret = -1;
size_t i; size_t i;
@ -15274,32 +15273,28 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
&diskdata[i], &diskdata[i],
actions, reuse) < 0) actions, reuse) < 0)
goto cleanup; goto cleanup;
do_transaction = true;
} }
if (do_transaction) { if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) goto cleanup;
goto cleanup;
rc = qemuMonitorTransaction(priv->mon, &actions); rc = qemuMonitorTransaction(priv->mon, &actions);
if (qemuDomainObjExitMonitor(driver, vm) < 0) if (qemuDomainObjExitMonitor(driver, vm) < 0)
rc = -1; rc = -1;
for (i = 0; i < ndiskdata; i++) { for (i = 0; i < ndiskdata; i++) {
qemuDomainSnapshotDiskDataPtr dd = &diskdata[i]; qemuDomainSnapshotDiskDataPtr dd = &diskdata[i];
virDomainAuditDisk(vm, dd->disk->src, dd->src, "snapshot", rc >= 0); virDomainAuditDisk(vm, dd->disk->src, dd->src, "snapshot", rc >= 0);
if (rc == 0) if (rc == 0)
qemuDomainSnapshotUpdateDiskSources(dd); qemuDomainSnapshotUpdateDiskSources(dd);
}
if (rc < 0)
goto cleanup;
} }
if (rc < 0)
goto cleanup;
ret = 0; ret = 0;
cleanup: cleanup: