Re: [libvirt] [PATCH 3/4] conf: Introduce virDomainObjListAddObjLocked

On 03/29/2018 02:34 PM, John Ferlan wrote: > Create a common helper to add an object to the locked domain > objlist hash tables and use it. > > Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; > --- > src/conf/virdomainobjlist.c | 64 +++++++++++++++++++++++++++------------------ > 1 file changed, 39 insertions(+), 25 deletions(-) > > diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c > index 765f46d5a..7022abe09 100644 > --- a/src/conf/virdomainobjlist.c > +++ b/src/conf/virdomainobjlist.c > @@ -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); I think this virObjectRef() could be moved in between those two virHashAddEntry() calls and thus the later call to virObjectRef() can be dropped then.