|
 |
99cbc7 |
From 8e342d61e9c51689689b000c73d1cd93a44e6980 Mon Sep 17 00:00:00 2001
|
|
|
99cbc7 |
Message-Id: <8e342d61e9c51689689b000c73d1cd93a44e6980@dist-git>
|
|
|
99cbc7 |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
99cbc7 |
Date: Tue, 11 Sep 2018 19:26:07 +0200
|
|
|
99cbc7 |
Subject: [PATCH] qemu: Report more appropriate running reasons
|
|
|
99cbc7 |
MIME-Version: 1.0
|
|
|
99cbc7 |
Content-Type: text/plain; charset=UTF-8
|
|
|
99cbc7 |
Content-Transfer-Encoding: 8bit
|
|
|
99cbc7 |
|
|
|
99cbc7 |
This patch replaces some rather generic VIR_DOMAIN_RUNNING_UNPAUSED
|
|
|
99cbc7 |
reasons when changing domain state to running with more specific ones.
|
|
|
99cbc7 |
All of them are done when libvirtd reconnects to an existing domain
|
|
|
99cbc7 |
after being restarted and sees an unfinished migration or save.
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
99cbc7 |
Reviewed-by: John Ferlan <jferlan@redhat.com>
|
|
|
99cbc7 |
(cherry picked from commit 54b5b0ac3945ad5417b67bec8443cf6e7b3d482b)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
https://bugzilla.redhat.com/show_bug.cgi?id=1634758
|
|
|
99cbc7 |
https://bugzilla.redhat.com/show_bug.cgi?id=1634759
|
|
|
99cbc7 |
https://bugzilla.redhat.com/show_bug.cgi?id=1612943
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
99cbc7 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
99cbc7 |
---
|
|
|
99cbc7 |
src/qemu/qemu_process.c | 6 +++---
|
|
|
99cbc7 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
|
|
99cbc7 |
index a4b1f97df5..26979faa72 100644
|
|
|
99cbc7 |
--- a/src/qemu/qemu_process.c
|
|
|
99cbc7 |
+++ b/src/qemu/qemu_process.c
|
|
|
99cbc7 |
@@ -3247,7 +3247,7 @@ qemuProcessRecoverMigrationIn(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
VIR_DEBUG("Incoming migration finished, resuming domain %s",
|
|
|
99cbc7 |
vm->def->name);
|
|
|
99cbc7 |
if (qemuProcessStartCPUs(driver, vm,
|
|
|
99cbc7 |
- VIR_DOMAIN_RUNNING_UNPAUSED,
|
|
|
99cbc7 |
+ VIR_DOMAIN_RUNNING_MIGRATED,
|
|
|
99cbc7 |
QEMU_ASYNC_JOB_NONE) < 0) {
|
|
|
99cbc7 |
VIR_WARN("Could not resume domain %s", vm->def->name);
|
|
|
99cbc7 |
}
|
|
|
99cbc7 |
@@ -3354,7 +3354,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
(reason == VIR_DOMAIN_PAUSED_MIGRATION ||
|
|
|
99cbc7 |
reason == VIR_DOMAIN_PAUSED_UNKNOWN)) {
|
|
|
99cbc7 |
if (qemuProcessStartCPUs(driver, vm,
|
|
|
99cbc7 |
- VIR_DOMAIN_RUNNING_UNPAUSED,
|
|
|
99cbc7 |
+ VIR_DOMAIN_RUNNING_MIGRATION_CANCELED,
|
|
|
99cbc7 |
QEMU_ASYNC_JOB_NONE) < 0) {
|
|
|
99cbc7 |
VIR_WARN("Could not resume domain %s", vm->def->name);
|
|
|
99cbc7 |
}
|
|
|
99cbc7 |
@@ -3412,7 +3412,7 @@ qemuProcessRecoverJob(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
reason == VIR_DOMAIN_PAUSED_MIGRATION)) ||
|
|
|
99cbc7 |
reason == VIR_DOMAIN_PAUSED_UNKNOWN)) {
|
|
|
99cbc7 |
if (qemuProcessStartCPUs(driver, vm,
|
|
|
99cbc7 |
- VIR_DOMAIN_RUNNING_UNPAUSED,
|
|
|
99cbc7 |
+ VIR_DOMAIN_RUNNING_SAVE_CANCELED,
|
|
|
99cbc7 |
QEMU_ASYNC_JOB_NONE) < 0) {
|
|
|
99cbc7 |
VIR_WARN("Could not resume domain '%s' after migration to file",
|
|
|
99cbc7 |
vm->def->name);
|
|
|
99cbc7 |
--
|
|
|
99cbc7 |
2.21.0
|
|
|
99cbc7 |
|