]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Properly check for incoming migration job
authorJiri Denemark <jdenemar@redhat.com>
Thu, 30 Jul 2015 13:53:41 +0000 (15:53 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Fri, 31 Jul 2015 13:15:12 +0000 (15:15 +0200)
In addition to checking the current asynchronous job
qemuMigrationJobIsActive reports an error if the current job does not
match the one we asked for. Let's just check the job directly since we
are not interested in the error in qemuProcessHandleMonitorEOF.

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

index 1c0c734c381174556ec13f84344336932d222639..23baa820c3bbfca9062a4e46b1188089e66aea08 100644 (file)
@@ -310,7 +310,7 @@ qemuProcessHandleMonitorEOF(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
         auditReason = "failed";
     }
 
-    if (qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_IN))
+    if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN)
         qemuMigrationErrorSave(driver, vm->def->name,
                                qemuMonitorLastError(priv->mon));