|
 |
7a3408 |
From 1b5fbd7f3c62217601b062d55bfec70eec8a1b07 Mon Sep 17 00:00:00 2001
|
|
|
7a3408 |
Message-Id: <1b5fbd7f3c62217601b062d55bfec70eec8a1b07@dist-git>
|
|
|
7a3408 |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
Date: Thu, 30 Jul 2015 15:53:41 +0200
|
|
|
7a3408 |
Subject: [PATCH] qemu: Properly check for incoming migration job
|
|
|
7a3408 |
|
|
|
7a3408 |
In addition to checking the current asynchronous job
|
|
|
7a3408 |
qemuMigrationJobIsActive reports an error if the current job does not
|
|
|
7a3408 |
match the one we asked for. Let's just check the job directly since we
|
|
|
7a3408 |
are not interested in the error in qemuProcessHandleMonitorEOF.
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
(cherry picked from commit 40a6dd9c16f4760ae01919f7710476c4c9804f4f)
|
|
|
7a3408 |
|
|
|
7a3408 |
https://bugzilla.redhat.com/show_bug.cgi?id=1242904
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
---
|
|
|
7a3408 |
src/qemu/qemu_process.c | 2 +-
|
|
|
7a3408 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
7a3408 |
|
|
|
7a3408 |
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
|
|
7a3408 |
index 35b6513..31315b1 100644
|
|
|
7a3408 |
--- a/src/qemu/qemu_process.c
|
|
|
7a3408 |
+++ b/src/qemu/qemu_process.c
|
|
|
7a3408 |
@@ -310,7 +310,7 @@ qemuProcessHandleMonitorEOF(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
auditReason = "failed";
|
|
|
7a3408 |
}
|
|
|
7a3408 |
|
|
|
7a3408 |
- if (qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_IN))
|
|
|
7a3408 |
+ if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN)
|
|
|
7a3408 |
qemuMigrationErrorSave(driver, vm->def->name,
|
|
|
7a3408 |
qemuMonitorLastError(priv->mon));
|
|
|
7a3408 |
|
|
|
7a3408 |
--
|
|
|
7a3408 |
2.5.0
|
|
|
7a3408 |
|