From bc816ae5ebdb29ea6adc5a4aa504994749ea060f Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 20 Apr 2021 17:08:07 +0200 Subject: [PATCH] qemuMigrationSrcNBDCopyCancelOne: Force-cancel disk copy jobs when aborting migration We don't require that the data is consistent on the destination if aborting the migration. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_migration.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index accf55e41a..2351f89b3c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -749,7 +749,9 @@ qemuMigrationSrcNBDCopyCancelOne(virQEMUDriver *driver, if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; - rv = qemuMonitorBlockJobCancel(priv->mon, job->name, false); + /* when we are aborting the migration we don't care about the data + * consistency on the destination so that we can force cancel the mirror */ + rv = qemuMonitorBlockJobCancel(priv->mon, job->name, abortMigration); if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) return -1;