External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock when reloading configs

Browse Source
This commit is contained in:
Daniel P. Berrange 2008-12-15 11:00:11 +00:00
parent 289d52c49e
commit 43b897c17a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Dec 15 10:59:19 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
* src/domain_conf.c: Unlock domain object after fetching
it to avoid deadlock when re-loading configs
Fri Dec 12 17:41:19 +0100 2008 Jim Meyering <meyering@redhat.com> Fri Dec 12 17:41:19 +0100 2008 Jim Meyering <meyering@redhat.com>
remove redundant optname arguments remove redundant optname arguments

5
src/domain_conf.c
View File

@ -3330,8 +3330,11 @@ virDomainObjPtr virDomainLoadConfig(virConnectPtr conn,
VIR_DOMAIN_XML_INACTIVE))) VIR_DOMAIN_XML_INACTIVE)))
goto error; goto error;
if (virDomainFindByName(doms, def->name)) if ((dom = virDomainFindByName(doms, def->name))) {
virDomainObjUnlock(dom);
dom = NULL;
newVM = 0; newVM = 0;
}
if (!(dom = virDomainAssignDef(conn, doms, def))) if (!(dom = virDomainAssignDef(conn, doms, def)))
goto error; goto error;