From 2ec54727f78afe9c88c93022d6f0c073298509f7 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 28 Apr 2021 14:16:37 +0200 Subject: [PATCH] qemuSnapshotDiskPrepareOne: Use data from qemuSnapshotDiskContext MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Remove all the arguments which are present in qemuSnapshotDiskContext. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko Reviewed-by: Pavel Hrdina --- src/qemu/qemu_snapshot.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index b917a2924d..544e7bd9b2 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1033,16 +1033,14 @@ qemuSnapshotDiskPrepareOneBlockdev(virQEMUDriver *driver, static int -qemuSnapshotDiskPrepareOne(virDomainObj *vm, - virQEMUDriverConfig *cfg, +qemuSnapshotDiskPrepareOne(qemuSnapshotDiskContext *snapctxt, virDomainDiskDef *disk, virDomainSnapshotDiskDef *snapdisk, - qemuSnapshotDiskContext *snapctxt, GHashTable *blockNamedNodeData, bool reuse, - bool updateConfig, - qemuDomainAsyncJob asyncJob) + bool updateConfig) { + virDomainObj *vm = snapctxt->vm; qemuDomainObjPrivate *priv = vm->privateData; virQEMUDriver *driver = priv->driver; bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); @@ -1118,8 +1116,8 @@ qemuSnapshotDiskPrepareOne(virDomainObj *vm, dd->prepared = true; if (blockdev) { - if (qemuSnapshotDiskPrepareOneBlockdev(driver, vm, dd, cfg, reuse, - blockNamedNodeData, asyncJob) < 0) + if (qemuSnapshotDiskPrepareOneBlockdev(driver, vm, dd, snapctxt->cfg, reuse, + blockNamedNodeData, snapctxt->asyncJob) < 0) return -1; if (qemuSnapshotDiskBitmapsPropagate(dd, snapctxt->actions, blockNamedNodeData) < 0) @@ -1145,7 +1143,6 @@ qemuSnapshotDiskPrepareOne(virDomainObj *vm, static qemuSnapshotDiskContext * qemuSnapshotDiskPrepareActiveExternal(virDomainObj *vm, virDomainMomentObj *snap, - virQEMUDriverConfig *cfg, bool reuse, GHashTable *blockNamedNodeData, qemuDomainAsyncJob asyncJob) @@ -1160,13 +1157,12 @@ qemuSnapshotDiskPrepareActiveExternal(virDomainObj *vm, if (snapdef->disks[i].snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) continue; - if (qemuSnapshotDiskPrepareOne(vm, cfg, vm->def->disks[i], + if (qemuSnapshotDiskPrepareOne(snapctxt, + vm->def->disks[i], snapdef->disks + i, - snapctxt, blockNamedNodeData, reuse, - true, - asyncJob) < 0) + true) < 0) return NULL; } @@ -1199,7 +1195,6 @@ qemuSnapshotGetTransientDiskDef(virDomainDiskDef *domdisk) static qemuSnapshotDiskContext * qemuSnapshotDiskPrepareDisksTransient(virDomainObj *vm, - virQEMUDriverConfig *cfg, GHashTable *blockNamedNodeData, qemuDomainAsyncJob asyncJob) { @@ -1221,11 +1216,10 @@ qemuSnapshotDiskPrepareDisksTransient(virDomainObj *vm, if (!(snapdisk = qemuSnapshotGetTransientDiskDef(domdisk))) return NULL; - if (qemuSnapshotDiskPrepareOne(vm, cfg, domdisk, snapdisk, snapctxt, + if (qemuSnapshotDiskPrepareOne(snapctxt, domdisk, snapdisk, blockNamedNodeData, false, - false, - asyncJob) < 0) + false) < 0) return NULL; } @@ -1350,7 +1344,7 @@ qemuSnapshotCreateActiveExternalDisks(virDomainObj *vm, /* prepare a list of objects to use in the vm definition so that we don't * have to roll back later */ - if (!(snapctxt = qemuSnapshotDiskPrepareActiveExternal(vm, snap, cfg, reuse, + if (!(snapctxt = qemuSnapshotDiskPrepareActiveExternal(vm, snap, reuse, blockNamedNodeData, asyncJob))) return -1; @@ -1384,7 +1378,7 @@ qemuSnapshotCreateDisksTransient(virDomainObj *vm, if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, asyncJob))) return -1; - if (!(snapctxt = qemuSnapshotDiskPrepareDisksTransient(vm, cfg, + if (!(snapctxt = qemuSnapshotDiskPrepareDisksTransient(vm, blockNamedNodeData, asyncJob))) return -1; -- 2.39.5