]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Don't reset "events" migration capability
authorJiri Denemark <jdenemar@redhat.com>
Fri, 28 Apr 2017 13:56:44 +0000 (15:56 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Tue, 2 May 2017 10:26:35 +0000 (12:26 +0200)
When creating v3.2.0-77-g8be3ccd04 commit, I completely forgot that one
migration capability is very special. It's the "events" capability which
tells QEMU to report "MIGRATION" events. Since libvirt always wants the
events, it is enabled in qemuConnectMonitor and the rest of the code
should not touch it.

https://bugzilla.redhat.com/show_bug.cgi?id=1439841
https://bugzilla.redhat.com/show_bug.cgi?id=1441165

Messed-up-by: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
src/qemu/qemu_migration.c

index b4507a3aebc762744d4d8ca742ecc3d1a426bc22..30f98da1eae15746ac83d547fcf1f8098db2b9b3 100644 (file)
@@ -5919,6 +5919,11 @@ qemuMigrationReset(virQEMUDriverPtr driver,
         goto cleanup;
 
     for (cap = 0; cap < QEMU_MONITOR_MIGRATION_CAPS_LAST; cap++) {
+        /* "events" capability is set (when supported) in qemuConnectMonitor
+         * and should never be cleared */
+        if (cap == QEMU_MONITOR_MIGRATION_CAPS_EVENTS)
+            continue;
+
         if (qemuMigrationSetOption(driver, vm, cap, false, job) < 0)
             goto cleanup;
     }