diff options
| author | Pavel Hrdina <phrdina@redhat.com> | 2014-09-22 18:19:07 +0200 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2014-10-01 12:18:48 -0600 |
| commit | 31674d08fc1b54cd30ad9422ba84090a8b4a3f48 (patch) | |
| tree | 5d727a49cb0eeeb83c965a6d0934646d2b758a1f | |
| parent | 35a802639d713054503f7243e39be0503fe19ec3 (diff) | |
| download | libvirt-31674d08fc1b54cd30ad9422ba84090a8b4a3f48.tar.gz | |
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)
| -rw-r--r-- | src/conf/domain_conf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5b0e25d5e8..a04c3075db 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16336,7 +16336,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))) { |