]> xenbits.xensource.com Git - libvirt.git/commitdiff
Revert "qemu: Avoid crash in qemuStateShutdownPrepare() and qemuStateShutdownWait()"
authorMichal Privoznik <mprivozn@redhat.com>
Thu, 9 Dec 2021 14:29:27 +0000 (15:29 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 10 Dec 2021 12:51:01 +0000 (13:51 +0100)
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>
src/qemu/qemu_driver.c

index 8093b8f69bf39eacc90b49f3858b4db6f36111b5..2b1a34fafb9b664d450de78ae98ace56ece56c89 100644 (file)
@@ -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);