External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-13 00:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Introduce virDomainObjListAddObjLocked

Browse Source 
Create a common helper to add an object to the locked domain
objlist hash tables and use it.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2018-03-26 18:18:56 -04:00
parent e0f7707cd5
commit c534d10ffe
1 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/conf/virdomainobjlist.c
View File

@ -220,6 +220,42 @@ virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms,
} }
/**
* @doms: Domain object list pointer
* @vm: Domain object to be added
*
* Upon entry @vm should have at least 1 ref and be locked.
*
* Add the @vm into the @doms->objs and @doms->objsName hash
* tables.
*
* Returns 0 on success with 2 references and locked
* -1 on failure with 1 reference and locked
*/
static int
virDomainObjListAddObjLocked(virDomainObjListPtr doms,
virDomainObjPtr vm)
{
char uuidstr[VIR_UUID_STRING_BUFLEN];
virUUIDFormat(vm->def->uuid, uuidstr);
if (virHashAddEntry(doms->objs, uuidstr, vm) < 0)
return -1;
if (virHashAddEntry(doms->objsName, vm->def->name, vm) < 0) {
virObjectRef(vm);
virHashRemoveEntry(doms->objs, uuidstr);
return -1;
}
/* Since domain is in two hash tables, increment the
* reference counter */
virObjectRef(vm);
return 0;
}
/* /*
* virDomainObjListAddLocked: * virDomainObjListAddLocked:
* *
@ -294,22 +330,10 @@ virDomainObjListAddLocked(virDomainObjListPtr doms,
goto cleanup; goto cleanup;
vm->def = def; vm->def = def;
virUUIDFormat(def->uuid, uuidstr); if (virDomainObjListAddObjLocked(doms, vm) < 0) {
if (virHashAddEntry(doms->objs, uuidstr, vm) < 0) {
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
return NULL; return NULL;
} }
if (virHashAddEntry(doms->objsName, def->name, vm) < 0) {
virObjectRef(vm);
virHashRemoveEntry(doms->objs, uuidstr);
virDomainObjEndAPI(&vm);
return NULL;
}
/* Since domain is in two hash tables, increment the
* reference counter */
virObjectRef(vm);
} }
cleanup: cleanup:
return vm; return vm;
@ -532,19 +556,9 @@ virDomainObjListLoadStatus(virDomainObjListPtr doms,
goto error; goto error;
} }
if (virHashAddEntry(doms->objs, uuidstr, obj) < 0) if (virDomainObjListAddObjLocked(doms, obj) < 0)
goto error; goto error;
if (virHashAddEntry(doms->objsName, obj->def->name, obj) < 0) {
virObjectRef(obj);
virHashRemoveEntry(doms->objs, uuidstr);
goto error;
}
/* Since domain is in two hash tables, increment the
* reference counter */
virObjectRef(obj);
if (notify) if (notify)
(*notify)(obj, 1, opaque); (*notify)(obj, 1, opaque);