From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 22 Sep 2014 16:19:07 +0000 (+0200)
Subject: domain_conf: fix domain deadlock
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e41e40fde8e9eb5bfd67467450aeb4767b45b9c;p=thirdparty%2Flibvirt.git

domain_conf: fix domain deadlock

If you use public api virConnectListAllDomains() with second parameter
set to NULL to get only the number of domains you will lock out all
other operations with domains.

Introduced by commit 2c680804.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
(cherry picked from commit fc22b2e74890873848b43fffae43025d22053669)
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 1d2146df38..c9d9b9e7fa 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -17770,7 +17770,7 @@ virDomainListPopulate(void *payload,
     /* just count the machines */
     if (!data->domains) {
         data->ndomains++;
-        return;
+        goto cleanup;
     }
 
     if (!(dom = virGetDomain(data->conn, vm->def->name, vm->def->uuid))) {