[libvirt PATCH v2 08/31] qemu_block: allow configuring autofinalize for block commit
External snapshots will use this to synchronize qemu block jobs.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_block.c | 9 ++++++++-
src/qemu/qemu_block.h | 1 +
src/qemu/qemu_driver.c | 3 ++-
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 99409a969b..da3a1e8557 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -3207,11 +3207,17 @@ qemuBlockExportAddNBD(virDomainObj *vm,
* @top_parent: disk source that has @topSource as backing disk
* @bandwidth: bandwidth limit, flags determine the unit
* @asyncJob: qemu async job type
+ * @autofinalize: virTristateBool controlling qemu block job finalization
* @flags: bitwise-OR of virDomainBlockCommitFlags
*
* Starts a block commit job for @disk. If @asyncJob is different then
* VIR_ASYNC_JOB_NONE the job will be started as synchronous.
*
+ * The @autofinalize argument controls if the qemu block job will be automatically
+ * finalized. This is used when deleting external snapshots where we need to
+ * disable automatic finalization for some use-case. The default value passed
+ * to this argument should be VIR_TRISTATE_BOOL_YES.
+ *
* Returns -1 on error, 0 on success.
*/
int
@@ -3222,6 +3228,7 @@ qemuBlockCommit(virDomainObj *vm,
virStorageSource *top_parent,
unsigned long bandwidth,
virDomainAsyncJob asyncJob,
+ virTristateBool autofinalize,
unsigned int flags)
{
qemuDomainObjPrivate *priv = vm->privateData;
@@ -3365,7 +3372,7 @@ qemuBlockCommit(virDomainObj *vm,
topSource->nodeformat,
baseSource->nodeformat,
backingPath, bandwidth,
- VIR_TRISTATE_BOOL_YES);
+ autofinalize);
qemuDomainObjExitMonitor(vm);
diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index 3f2082f102..7b6aec2a7d 100644
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -285,6 +285,7 @@ qemuBlockCommit(virDomainObj *vm,
virStorageSource *top_parent,
unsigned long bandwidth,
virDomainAsyncJob asyncJob,
+ virTristateBool autofinalize,
unsigned int flags);
int
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index acd67b1f5a..12fca22616 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15031,7 +15031,8 @@ qemuDomainBlockCommit(virDomainPtr dom,
goto endjob;
ret = qemuBlockCommit(vm, disk, baseSource, topSource, top_parent,
- bandwidth, VIR_ASYNC_JOB_NONE, flags);
+ bandwidth, VIR_ASYNC_JOB_NONE, VIR_TRISTATE_BOOL_YES,
+ flags);
endjob:
virDomainObjEndJob(vm);
--
2.39.0