From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 30 Jul 2015 13:53:41 +0000 (+0200)
Subject: qemu: Properly check for incoming migration job
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=40a6dd9c16f4760ae01919f7710476c4c9804f4f;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

qemu: Properly check for incoming migration job

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>
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 1c0c734c3..23baa820c 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -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));