External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

conf: replace call to virNetworkFree() with virObjectUnref()

Browse Source 
The function virNetworkObjListExport() in network_conf.c had a call to
the public API virNetworkFree() which was causing a link error:

CCLD     libvirt_driver_vbox_network_impl.la
 ./.libs/libvirt_conf.a(libvirt_conf_la-network_conf.o): In function `virNetworkObjListExport':
/home/laine/devel/libvirt/src/conf/network_conf.c:4496: undefined reference to `virNetworkFree'

This would happen when I added

  #include "network_conf.h"

into domain_conf.h, then attempted to call a new function from that
file (and enum converter, similar to virNetworkForwardTypeToString())

In the end, virNetworkFree() ends up just calling virObjectUnref(obj)
anyway (after clearing all pending errors, which we probably *don't*
want to do in the cleanup of a utility function), so this is likely
more correct than the original code as well.
This commit is contained in:
Laine Stump 2014-11-25 04:17:51 -05:00
parent b79d195b72
commit c2d5bca167
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/network_conf.c
View File

@ -4463,10 +4463,8 @@ virNetworkObjListExport(virConnectPtr conn,
cleanup: cleanup:
if (tmp_nets) { if (tmp_nets) {
for (i = 0; i < nnets; i++) { for (i = 0; i < nnets; i++)
if (tmp_nets[i]) virObjectUnref(tmp_nets[i]);
virNetworkFree(tmp_nets[i]);
}
} }
VIR_FREE(tmp_nets); VIR_FREE(tmp_nets);