NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

network: Have virNetworkObjNew lock the returned object

Browse Source 
Forces callers to use the virNetworkObjEndAPI properly.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-05-10 08:40:40 -04:00
parent 26c8fe4990
commit 7beef70871
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf/virnetworkobj.c
View File

@ -87,6 +87,8 @@ virNetworkObjNew(void)
ignore_value(virBitmapSetBit(obj->classIdMap, 1)); ignore_value(virBitmapSetBit(obj->classIdMap, 1));
ignore_value(virBitmapSetBit(obj->classIdMap, 2)); ignore_value(virBitmapSetBit(obj->classIdMap, 2));
virObjectLock(obj);
return obj; return obj;
error: error:
@ -572,8 +574,6 @@ virNetworkObjAssignDefLocked(virNetworkObjListPtr nets,
if (!(obj = virNetworkObjNew())) if (!(obj = virNetworkObjNew()))
goto cleanup; goto cleanup;
virObjectLock(obj);
virUUIDFormat(def->uuid, uuidstr); virUUIDFormat(def->uuid, uuidstr);
if (virHashAddEntry(nets->objs, uuidstr, obj) < 0) if (virHashAddEntry(nets->objs, uuidstr, obj) < 0)
goto cleanup; goto cleanup;

2
tests/networkxml2conftest.c
View File

@ -67,7 +67,7 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf, dnsmasqCapsPtr
VIR_FREE(actual); VIR_FREE(actual);
VIR_FREE(pidfile); VIR_FREE(pidfile);
virCommandFree(cmd); virCommandFree(cmd);
virObjectUnref(obj); virNetworkObjEndAPI(&obj);
dnsmasqContextFree(dctx); dnsmasqContextFree(dctx);
return ret; return ret;
} }