Move the internals into qemuDomainSnapshotDiskDataCollectOne to make it
obvious what's happening after moving more code here.
Signed-off-by: Peter Krempa
---
src/qemu/qemu_driver.c | 104 +++--
1 file changed, 59 insertions(+), 45 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 52540eb77d..57d864cdd2 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15316,6 +15316,62 @@
qemuDomainSnapshotDiskDataCleanup(qemuDomainSnapshotDiskDataPtr data,
}
+static int
+qemuDomainSnapshotDiskDataCollectOne(virQEMUDriverPtr driver,
+ virDomainObjPtr vm,
+ virDomainDiskDefPtr disk,
+ virDomainSnapshotDiskDefPtr snapdisk,
+ qemuDomainSnapshotDiskDataPtr dd,
+ bool reuse)
+{
+char *backingStoreStr;
+virDomainDiskDefPtr persistdisk;
+
+dd->disk = disk;
+
+if (!(dd->src = virStorageSourceCopy(snapdisk->src, false)))
+return -1;
+
+if (virStorageSourceInitChainElement(dd->src, dd->disk->src, false) < 0)
+return -1;
+
+/* modify disk in persistent definition only when the source is the same */
+if (vm->newDef &&
+(persistdisk = virDomainDiskByName(vm->newDef, dd->disk->dst, false))
&&
+virStorageSourceIsSameLocation(dd->disk->src, persistdisk->src)) {
+
+dd->persistdisk = persistdisk;
+
+if (!(dd->persistsrc = virStorageSourceCopy(dd->src, false)))
+return -1;
+
+if (virStorageSourceInitChainElement(dd->persistsrc,
+ dd->persistdisk->src, false) < 0)
+return -1;
+}
+
+if (qemuDomainStorageFileInit(driver, vm, dd->src, NULL) < 0)
+return -1;
+
+dd->initialized = true;
+
+/* relative backing store paths need to be updated so that relative
+ * block commit still works */
+if (reuse) {
+if (virStorageFileGetBackingStoreStr(dd->src, ) < 0)
+return -1;
+if (backingStoreStr != NULL) {
+if (virStorageIsRelative(backingStoreStr))
+VIR_STEAL_PTR(dd->relPath, backingStoreStr);
+else
+VIR_FREE(backingStoreStr);
+}
+}
+
+return 0;
+}
+
+
/**
* qemuDomainSnapshotDiskDataCollect:
*
@@ -15333,10 +15389,7 @@ qemuDomainSnapshotDiskDataCollect(virQEMUDriverPtr
driver,
size_t i;
qemuDomainSnapshotDiskDataPtr data;
size_t ndata = 0;
-qemuDomainSnapshotDiskDataPtr dd;
-char *backingStoreStr;
virDomainSnapshotDefPtr snapdef = virDomainSnapshotObjGetDef(snap);
-virDomainDiskDefPtr persistdisk;
int ret = -1;
if (VIR_ALLOC_N(data, snapdef->ndisks) < 0)
@@ -15346,49 +15399,10 @@ qemuDomainSnapshotDiskDataCollect(virQEMUDriverPtr
driver,
if (snapdef->disks[i].snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NONE)
continue;
-dd = data + ndata;
-ndata++;
-
-dd->disk = vm->def->disks[i];
-
-if (!(dd->src = virStorageSourceCopy(snapdef->disks[i].src, false)))
-goto cleanup;
-
-if (virStorageSourceInitChainElement(dd->src, dd->disk->src, false) <
0)
+if (qemuDomainSnapshotDiskDataCollectOne(driver, vm, vm->def->disks[i],
+ snapdef->disks + i,
+ data + ndata++, reuse) < 0)
goto cleanup;
-
-/* modify disk in persistent definition only when the source is the
same */
-if (vm->newDef &&
-(persistdisk = virDomainDiskByName(vm->newDef, dd->disk->dst,
false)) &&
-virStorageSourceIsSameLocation(dd->disk->src, persistdisk->src)) {
-
-dd->persistdisk = persistdisk;
-
-if (!(dd->persistsrc = virStorageSourceCopy(dd->src, false)))
-goto cleanup;
-
-if (virStorageSourceInitChainElement(dd->persistsrc,
- dd->persistdisk->src, false)
< 0)
-goto cleanup;
-}
-
-if (qemuDomainStorageFileInit(driver, vm, dd->src, NULL) < 0)
-goto cleanup;
-
-dd->initialized = true;
-
-/* relative backing store paths need to be updated so that relative
- * block commit still works */
-if (reuse) {
-if (virStorageFileGetBackingStoreStr(dd->src, ) <
0)
-goto cleanup;
-if (backingStoreStr != NULL) {
-if (virStorageIsRelative(backingStoreStr))
-VIR_STEAL_PTR(dd->relPath, backingStoreStr);
-else
-VIR_FREE(backingStoreStr);
-}
-}
}
VIR_STEAL_PTR(*rdata, data);
--
2.21.0
--
libvir-list mailing list
libvir-list@redhat.com
