From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 9 Dec 2021 14:29:27 +0000 (+0100)
Subject: Revert "qemu: Avoid crash in qemuStateShutdownPrepare() and qemuStateShutdownWait()"
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3179220e4faccb49e9202f625ce3fdc720e723ea;p=libvirt.git

Revert "qemu: Avoid crash in qemuStateShutdownPrepare() and qemuStateShutdownWait()"

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@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

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);