External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-09 09:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "interface: Consume @def in virInterfaceObjNew"

Browse Source 
This reverts commit 92840eb3a7.

More recent reviews/changes don't have the vir*ObjNew APIs
consuming the @def, so remove from Interface as well. Changes
needed to also deal with conflicts from commit id '46f5eca4'.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-07-29 07:20:59 -04:00
parent b887d7b0c7
commit c447086f01
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/conf/virinterfaceobj.c
View File

@ -74,7 +74,7 @@ virInterfaceObjDispose(void *opaque)
static virInterfaceObjPtr
virInterfaceObjNew(virInterfaceDefPtr def)
virInterfaceObjNew(void)
{
virInterfaceObjPtr obj;
@ -85,7 +85,6 @@ virInterfaceObjNew(virInterfaceDefPtr def)
return NULL;
virObjectLock(obj);
obj->def = def;
return obj;
}
@ -261,15 +260,15 @@ virInterfaceObjListAssignDef(virInterfaceObjListPtr interfaces,
return obj;
}
if (!(obj = virInterfaceObjNew(def)))
if (!(obj = virInterfaceObjNew()))
return NULL;
if (VIR_APPEND_ELEMENT_COPY(interfaces->objs,
interfaces->count, obj) < 0) {
obj->def = NULL;
virInterfaceObjEndAPI(&obj);
return NULL;
}
obj->def = def;
return virObjectRef(obj);
}