Re: [libvirt] [PATCH v2 22/25] qemu: driver: Allow cancellation of the backup job

Use the helper which cancels all blockjobs to perform the backup job cancellation in qemuDomainAbortJob. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_driver.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 95882d9d14..2408b08106 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14054,11 +14054,16 @@ static int qemuDomainAbortJob(virDomainPtr dom) } VIR_DEBUG("Cancelling job at client request"); - qemuDomainObjAbortAsyncJob(vm); - qemuDomainObjEnterMonitor(driver, vm); - ret = qemuMonitorMigrateCancel(priv->mon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret = -1; + if (priv->job.asyncJob == QEMU_ASYNC_JOB_BACKUP) { + qemuBackupJobCancelBlockjobs(vm, priv->backup, true); + ret = 0; + } else { + qemuDomainObjAbortAsyncJob(vm); + qemuDomainObjEnterMonitor(driver, vm); + ret = qemuMonitorMigrateCancel(priv->mon); + if (qemuDomainObjExitMonitor(driver, vm) < 0) + ret = -1; + }