[PATCH 2/2] Revert "qemu: Avoid crash in qemuStateShutdownPrepare() and qemuStateShutdownWait()"

Michal Privoznik mprivozn at redhat.com
Thu Dec 9 16:17:50 UTC 2021


This reverts commit 69977ff10560a80bcf5bf93f1a3f819a2d1623ca.

After previous commit it's no longer possible that QEMU driver is
not initialized in qemuStateShutdownPrepare() nor
qemuStateShutdownWait().

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_driver.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 8093b8f69b..2b1a34fafb 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1034,9 +1034,6 @@ qemuStateStop(void)
 static int
 qemuStateShutdownPrepare(void)
 {
-    if (!qemu_driver)
-        return 0;
-
     virThreadPoolStop(qemu_driver->workerPool);
     return 0;
 }
@@ -1056,9 +1053,6 @@ qemuDomainObjStopWorkerIter(virDomainObj *vm,
 static int
 qemuStateShutdownWait(void)
 {
-    if (!qemu_driver)
-        return 0;
-
     virDomainObjListForEach(qemu_driver->domains, false,
                             qemuDomainObjStopWorkerIter, NULL);
     virThreadPoolDrain(qemu_driver->workerPool);
-- 
2.32.0




More information about the libvir-list mailing list