External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 05:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuSnapshotDiskPrepareOne: Pass in qemuSnapshotDiskContext

Browse Source 
Rather than filling various parts of the context from arguments pass in
the whole context.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2021-04-28 13:57:57 +02:00
parent 06e9b0c28d
commit 983bad4771
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/qemu/qemu_snapshot.c
View File

@ -1030,12 +1030,11 @@ qemuSnapshotDiskPrepareOne(virDomainObj *vm,
virQEMUDriverConfig *cfg,
virDomainDiskDef *disk,
virDomainSnapshotDiskDef *snapdisk,
qemuSnapshotDiskData *dd,
qemuSnapshotDiskContext *snapctxt,
GHashTable *blockNamedNodeData,
bool reuse,
bool updateConfig,
qemuDomainAsyncJob asyncJob,
virJSONValue *actions)
qemuDomainAsyncJob asyncJob)
{
qemuDomainObjPrivate *priv = vm->privateData;
virQEMUDriver *driver = priv->driver;
@ -1043,6 +1042,7 @@ qemuSnapshotDiskPrepareOne(virDomainObj *vm,
virDomainDiskDef *persistdisk;
bool supportsCreate;
bool updateRelativeBacking = false;
qemuSnapshotDiskData *dd = snapctxt->dd + snapctxt->ndd++;
dd->disk = disk;
@ -1115,13 +1115,13 @@ qemuSnapshotDiskPrepareOne(virDomainObj *vm,
blockNamedNodeData, asyncJob) < 0)
return -1;
if (qemuSnapshotDiskBitmapsPropagate(dd, actions, blockNamedNodeData) < 0)
if (qemuSnapshotDiskBitmapsPropagate(dd, snapctxt->actions, blockNamedNodeData) < 0)
return -1;
if (qemuBlockSnapshotAddBlockdev(actions, dd->disk, dd->src) < 0)
if (qemuBlockSnapshotAddBlockdev(snapctxt->actions, dd->disk, dd->src) < 0)
return -1;
} else {
if (qemuBlockSnapshotAddLegacy(actions, dd->disk, dd->src, reuse) < 0)
if (qemuBlockSnapshotAddLegacy(snapctxt->actions, dd->disk, dd->src, reuse) < 0)
return -1;
}
@ -1155,12 +1155,11 @@ qemuSnapshotDiskPrepareActiveExternal(virDomainObj *vm,
if (qemuSnapshotDiskPrepareOne(vm, cfg, vm->def->disks[i],
snapdef->disks + i,
snapctxt->dd + snapctxt->ndd++,
snapctxt,
blockNamedNodeData,
reuse,
true,
asyncJob,
snapctxt->actions) < 0)
asyncJob) < 0)
return NULL;
}
@ -1215,13 +1214,11 @@ qemuSnapshotDiskPrepareDisksTransient(virDomainObj *vm,
if (!(snapdisk = qemuSnapshotGetTransientDiskDef(domdisk)))
return NULL;
if (qemuSnapshotDiskPrepareOne(vm, cfg, domdisk, snapdisk,
snapctxt->dd + snapctxt->ndd++,
if (qemuSnapshotDiskPrepareOne(vm, cfg, domdisk, snapdisk, snapctxt,
blockNamedNodeData,
false,
false,
asyncJob,
snapctxt->actions) < 0)
asyncJob) < 0)
return NULL;
}