47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From 30121d9c7797f6bbd60caba5feaeed90b3602cce Mon Sep 17 00:00:00 2001
|
|
From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
|
|
Date: Thu, 23 Jul 2020 10:10:26 +0300
|
|
Subject: [PATCH 011/108] qemu: don't shutdown event thread in monitor EOF
|
|
callback
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This hunk was introduced in [1] in order to avoid loosing
|
|
events from monitor on stopping qemu process. But as explained
|
|
in [2] on destroy we won't get neither EOF nor any other
|
|
events as monitor is just closed. In case of crash/shutdown
|
|
we won't get any more events as well and qemuDomainObjStopWorker
|
|
will be called by qemuProcessStop eventually. Thus let's
|
|
remove qemuDomainObjStopWorker from qemuProcessHandleMonitorEOF
|
|
as it is not useful anymore.
|
|
|
|
[1] e6afacb0f: qemu: start/stop an event loop thread for domains
|
|
[2] d2954c072: qemu: ensure domain event thread is always stopped
|
|
|
|
Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
|
|
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
(cherry picked from commit 5c0cd375d1d1659ae3a5db0ce3e26e5570123dff)
|
|
---
|
|
src/qemu/qemu_process.c | 3 ---
|
|
1 file changed, 3 deletions(-)
|
|
|
|
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
|
index 74bb9613bc..890603f66b 100644
|
|
--- a/src/qemu/qemu_process.c
|
|
+++ b/src/qemu/qemu_process.c
|
|
@@ -325,9 +325,6 @@ qemuProcessHandleMonitorEOF(qemuMonitorPtr mon,
|
|
qemuDomainDestroyNamespace(driver, vm);
|
|
|
|
cleanup:
|
|
- /* Now we got EOF we're not expecting more I/O, so we
|
|
- * can finally kill the event thread */
|
|
- qemuDomainObjStopWorker(vm);
|
|
virObjectUnlock(vm);
|
|
}
|
|
|
|
--
|
|
2.33.0
|
|
|