External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 06:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

bhyve: bhyveDomainDefineXML fixes

Browse Source 
- do not lose new definition for an active domain
- do not leak oldDef
- do not set dom->id if virDomainSaveConfig() fails
- do not call virObjectUnlock(vm) if vm is NULL
This commit is contained in:
Roman Bogorodskiy 2014-04-21 20:15:26 +04:00
parent 7b6b9d3863
commit fa8a389ebb
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bhyve/bhyve_driver.c
View File

@ -472,16 +472,22 @@ bhyveDomainDefineXML(virConnectPtr conn, const char *xml)
def = NULL; def = NULL;
vm->persistent = 1; vm->persistent = 1;
if (virDomainSaveConfig(BHYVE_CONFIG_DIR,
vm->newDef ? vm->newDef : vm->def) < 0) {
virDomainObjListRemove(privconn->domains, vm);
vm = NULL;
goto cleanup;
}
dom = virGetDomain(conn, vm->def->name, vm->def->uuid); dom = virGetDomain(conn, vm->def->name, vm->def->uuid);
if (dom) if (dom)
dom->id = vm->def->id; dom->id = vm->def->id;
if (virDomainSaveConfig(BHYVE_CONFIG_DIR, vm->def) < 0)
goto cleanup;
cleanup: cleanup:
virObjectUnref(caps); virObjectUnref(caps);
virDomainDefFree(def); virDomainDefFree(def);
virDomainDefFree(oldDef);
if (vm)
virObjectUnlock(vm); virObjectUnlock(vm);
return dom; return dom;