|
|
99cbc7 |
From 45d759d4b20daea1e58a823f1ae082d6875fa21e Mon Sep 17 00:00:00 2001
|
|
|
99cbc7 |
Message-Id: <45d759d4b20daea1e58a823f1ae082d6875fa21e@dist-git>
|
|
|
99cbc7 |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
99cbc7 |
Date: Mon, 10 Sep 2018 15:10:54 +0200
|
|
|
99cbc7 |
Subject: [PATCH] qemu: Properly report VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT
|
|
|
99cbc7 |
MIME-Version: 1.0
|
|
|
99cbc7 |
Content-Type: text/plain; charset=UTF-8
|
|
|
99cbc7 |
Content-Transfer-Encoding: 8bit
|
|
|
99cbc7 |
|
|
|
99cbc7 |
VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT was defined but not used anywhere
|
|
|
99cbc7 |
in our event generation code. This fixes qemuDomainRevertToSnapshot to
|
|
|
99cbc7 |
properly report why the domain was resumed.
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
99cbc7 |
Reviewed-by: John Ferlan <jferlan@redhat.com>
|
|
|
99cbc7 |
(cherry picked from commit 55af06187c48a01192764d8638b85739b0178fe0)
|
|
|
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_driver.c | 2 +-
|
|
|
99cbc7 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
99cbc7 |
index c7689cc239..26aa557d9f 100644
|
|
|
99cbc7 |
--- a/src/qemu/qemu_driver.c
|
|
|
99cbc7 |
+++ b/src/qemu/qemu_driver.c
|
|
|
99cbc7 |
@@ -16321,7 +16321,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
|
|
|
99cbc7 |
detail);
|
|
|
99cbc7 |
} else if (!was_running) {
|
|
|
99cbc7 |
/* Transition 8 */
|
|
|
99cbc7 |
- detail = VIR_DOMAIN_EVENT_RESUMED;
|
|
|
99cbc7 |
+ detail = VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT;
|
|
|
99cbc7 |
event = virDomainEventLifecycleNewFromObj(vm,
|
|
|
99cbc7 |
VIR_DOMAIN_EVENT_RESUMED,
|
|
|
99cbc7 |
detail);
|
|
|
99cbc7 |
--
|
|
|
99cbc7 |
2.21.0
|
|
|
99cbc7 |
|