If the virHashAddEntry fails, then we need to "careful" about how we free the @vm. When virDomainObjNew returns there is one reference and the object is locked, so use virDomainObjEndAPI when done. Add a virObjectRef in the error path for the second virHashAddEntry call since it doesn't call virObjectRef, but virHashRemoveEntry will call virObjectUnref because virObjectFreeHashData is called when the element is removed from the hash table as set up in virDomainObjListNew. Eventually these paths should goto error and error should be changed to use EndAPI as well, but that requires more adjustments to other paths in the code to have a locked and ref counted @vm. Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; --- src/conf/virdomainobjlist.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 87a742b1e..2ae8a41a1 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -296,12 +296,14 @@ virDomainObjListAddLocked(virDomainObjListPtr doms, virUUIDFormat(def->uuid, uuidstr); if (virHashAddEntry(doms->objs, uuidstr, vm) < 0) { - virObjectUnref(vm); + virObjectEndAPI(&vm); return NULL; } if (virHashAddEntry(doms->objsName, def->name, vm) < 0) { + virObjectRef(vm); virHashRemoveEntry(doms->objs, uuidstr); + virObjectEndAPI(&vm); return NULL; } -- 2.13.6

On 04/06/2018 08:56 AM, Michal Privoznik wrote: Oh right - good catch... obviously I worked backwards from patch 3 but my fingers mistyped things Fixed... Tks, John

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); + + return 0; +} + + /* * virDomainObjListAddLocked: * @@ -294,22 +330,10 @@ virDomainObjListAddLocked(virDomainObjListPtr doms, goto cleanup; vm->def = def; - virUUIDFormat(def->uuid, uuidstr); - if (virHashAddEntry(doms->objs, uuidstr, vm) < 0) { - virObjectEndAPI(&vm); + if (virDomainObjListAddObjLocked(doms, vm) < 0) { + virDomainObjEndAPI(&vm); return NULL; } - - if (virHashAddEntry(doms->objsName, def->name, vm) < 0) { - virObjectRef(vm); - virHashRemoveEntry(doms->objs, uuidstr); - virObjectEndAPI(&vm); - return NULL; - } - - /* Since domain is in two hash tables, increment the - * reference counter */ - virObjectRef(vm); } cleanup: return vm; @@ -532,19 +556,9 @@ virDomainObjListLoadStatus(virDomainObjListPtr doms, goto error; } - if (virHashAddEntry(doms->objs, uuidstr, obj) < 0) + if (virDomainObjListAddObjLocked(doms, obj) < 0) 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) (*notify)(obj, 1, opaque); -- 2.13.6

On 04/06/2018 08:56 AM, Michal Privoznik wrote: True; however, the purpose of the first two patches was to set the code up to mirror each other and thus have this helper instead do the same thing. The reality is the next step *is* to put a virObjectRef between the two and thus have 2 virObjectRef calls to match the 2 Unref calls in the *Remove function. The next step also removes the comment leaving an ObjectRef after each successful AddEntry. Doing this means "some" drivers won't need the extra virObjectRef after they call the Add function, while "other" drivers will need to use the Remove and EndAPI after they call the Add function. I've been trying to coordinate this effort with the FindBy{UUID|ID}[Ref] effort as they are (in a way) strangely related. Tks- John