]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Always reset TLS in qemuProcessRecoverMigrationOut
authorJiri Denemark <jdenemar@redhat.com>
Wed, 5 Apr 2017 10:04:09 +0000 (12:04 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Fri, 7 Apr 2017 11:43:37 +0000 (13:43 +0200)
qemuProcessRecoverMigrationOut doesn't explicitly call
qemuMigrationResetTLS relying on two things:

    - qemuMigrationCancel resets TLS parameters
    - our migration code resets TLS before entering
      QEMU_MIGRATION_PHASE_PERFORM3_DONE phase

But this is not obvious and the assumptions will be broken soon. Let's
explicitly reset TLS parameters on all paths which do not kill the
domain.

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

index 0783286d4e9497b069eccc0393df1b0c9c8f7901..4c7e9df54f31a3068ee0113914446b9b4c5a4e55 100644 (file)
@@ -3077,6 +3077,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver,
         }
     }
 
+    qemuMigrationResetTLS(driver, vm, QEMU_ASYNC_JOB_NONE, NULL, NULL);
     return 0;
 }