[PATCH 4/5] qemuDomainChangeEjectableMedia: Separate rollback and success code paths
From: Peter Krempa <pkrempa(a)redhat.com>
Do not use the rollback code path on success just to avoid extra call to
qemuHotplugRemoveManagedPR.
Rename the label and use it only when rolling back.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_hotplug.c | 37 +++++++++++++++----------------------
1 file changed, 15 insertions(+), 22 deletions(-)
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index bb599d1505..d6de9afccd 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -613,9 +613,6 @@ qemuDomainChangeEjectableMedia(virQEMUDriver *driver,
qemuDomainObjPrivate *priv = vm->privateData;
virStorageSource *oldsrc = disk->src;
qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
- bool managedpr = virStorageSourceChainHasManagedPR(oldsrc) ||
- virStorageSourceChainHasManagedPR(newsrc);
- int ret = -1;
int rc;
if (diskPriv->blockjob && qemuBlockJobIsRunning(diskPriv->blockjob)) {
@@ -627,49 +624,45 @@ qemuDomainChangeEjectableMedia(virQEMUDriver *driver,
disk->src = newsrc;
if (virDomainDiskTranslateSourcePool(disk) < 0)
- goto cleanup;
+ goto rollback;
if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL) < 0)
- goto cleanup;
+ goto rollback;
if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0)
- goto cleanup;
+ goto rollback;
if (qemuDomainStorageSourceChainAccessAllow(driver, vm, newsrc) < 0)
- goto cleanup;
+ goto rollback;
if (qemuHotplugAttachManagedPR(vm, newsrc, VIR_ASYNC_JOB_NONE) < 0)
- goto cleanup;
+ goto rollback;
rc = qemuDomainChangeMediaBlockdev(vm, disk, oldsrc, newsrc, force);
virDomainAuditDisk(vm, oldsrc, newsrc, "update", rc >= 0);
if (rc < 0)
- goto cleanup;
+ goto rollback;
ignore_value(qemuDomainStorageSourceChainAccessRevoke(driver, vm, oldsrc));
+ if (virStorageSourceChainHasManagedPR(oldsrc))
+ qemuHotplugRemoveManagedPR(vm, VIR_ASYNC_JOB_NONE);
+
/* media was changed, so we can remove the old media definition now */
g_clear_pointer(&oldsrc, virObjectUnref);
+ return 0;
- ret = 0;
-
- cleanup:
- /* undo changes to the new disk */
- if (ret < 0) {
- ignore_value(qemuDomainStorageSourceChainAccessRevoke(driver, vm, newsrc));
- }
+ rollback:
+ ignore_value(qemuDomainStorageSourceChainAccessRevoke(driver, vm, newsrc));
- /* remove PR manager object if unneeded */
- if (managedpr)
+ if (virStorageSourceChainHasManagedPR(newsrc))
qemuHotplugRemoveManagedPR(vm, VIR_ASYNC_JOB_NONE);
/* revert old image do the disk definition */
- if (oldsrc)
- disk->src = oldsrc;
-
- return ret;
+ disk->src = oldsrc;
+ return -1;
}
--
2.48.1