From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Fri, 7 Apr 2017 11:06:25 +0000 (+0300)
Subject: qemu: migration: fix race on cancelling drive mirror
X-Git-Tag: v3.3.0-rc1~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc82d1eaf66bfdfde80a64e7feedb60c6d1d2505;p=thirdparty%2Flibvirt.git

qemu: migration: fix race on cancelling drive mirror

0feebab2 adds calling qemuBlockNodeNamesDetect for completed job
on updating block jobs. This affects cancelling drive mirror logic as
this function drops vm lock. Now we have to recheck all disks
before the disk with the completed block job before going
to wait for block job events.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 9ea600c481..eae6698aee 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -655,9 +655,11 @@ qemuMigrationDriveMirrorCancelled(virQEMUDriverPtr driver,
 {
     size_t i;
     size_t active = 0;
+    size_t completed = 0;
     int status;
     bool failed = false;
 
+ retry:
     for (i = 0; i < vm->def->ndisks; i++) {
         virDomainDiskDefPtr disk = vm->def->disks[i];
         qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
@@ -684,6 +686,19 @@ qemuMigrationDriveMirrorCancelled(virQEMUDriverPtr driver,
         default:
             active++;
         }
+
+        if (status == VIR_DOMAIN_BLOCK_JOB_COMPLETED)
+            completed++;
+    }
+
+    /* Updating completed block job drops the lock thus we have to recheck
+     * block jobs for disks that reside before the disk(s) with completed
+     * block job.
+     */
+    if (completed > 0) {
+        completed = 0;
+        active = 0;
+        goto retry;
     }
 
     if (failed) {