shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-30 18:50:18 +03:00
Code Releases Activity

qemuDomainChangeEjectableMedia: Separate rollback and success code paths

Browse Source 
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@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2025-03-17 18:09:03 +01:00
parent 1f00a208ea
commit ad94d8fb19
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/qemu/qemu_hotplug.c
View File

@ -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;
rollback:
ignore_value(qemuDomainStorageSourceChainAccessRevoke(driver, vm, newsrc));
cleanup:
/* undo changes to the new disk */
if (ret < 0) {
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;
}