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

conf: use g_free() instead of VIR_FREE in virDomainNetDefFree()

Browse Source 
All these lines were moved over from the now-defunct
virDomainNetDefClear(), which required all pointers to be cleared
after free, but virDomainNetDefFree() doesn't have that restriction -
after free'ing the pointers are never again referenced, so g_free() is
safe.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Laine Stump 2020-09-26 12:59:11 -04:00
parent 47d622b560
commit be0791039e
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/conf/domain_conf.c
View File

@ -2509,27 +2509,27 @@ virDomainNetDefFree(virDomainNetDefPtr def)
case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_CLIENT:
case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_MCAST:
case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_UDP:
VIR_FREE(def->data.socket.address); g_free(def->data.socket.address);
VIR_FREE(def->data.socket.localaddr); g_free(def->data.socket.localaddr);
break; break;
case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_NETWORK:
VIR_FREE(def->data.network.name); g_free(def->data.network.name);
VIR_FREE(def->data.network.portgroup); g_free(def->data.network.portgroup);
virDomainActualNetDefFree(def->data.network.actual); virDomainActualNetDefFree(def->data.network.actual);
def->data.network.actual = NULL; def->data.network.actual = NULL;
break; break;
case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_BRIDGE:
VIR_FREE(def->data.bridge.brname); g_free(def->data.bridge.brname);
break; break;
case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_INTERNAL:
VIR_FREE(def->data.internal.name); g_free(def->data.internal.name);
break; break;
case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_DIRECT:
VIR_FREE(def->data.direct.linkdev); g_free(def->data.direct.linkdev);
break; break;
case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_HOSTDEV:
@ -2542,24 +2542,24 @@ virDomainNetDefFree(virDomainNetDefPtr def)
break; break;
} }
VIR_FREE(def->backend.tap); g_free(def->backend.tap);
VIR_FREE(def->backend.vhost); g_free(def->backend.vhost);
VIR_FREE(def->teaming.persistent); g_free(def->teaming.persistent);
VIR_FREE(def->virtPortProfile); g_free(def->virtPortProfile);
VIR_FREE(def->script); g_free(def->script);
VIR_FREE(def->downscript); g_free(def->downscript);
VIR_FREE(def->domain_name); g_free(def->domain_name);
VIR_FREE(def->ifname); g_free(def->ifname);
VIR_FREE(def->ifname_guest); g_free(def->ifname_guest);
VIR_FREE(def->ifname_guest_actual); g_free(def->ifname_guest_actual);
VIR_FREE(def->virtio); g_free(def->virtio);
VIR_FREE(def->coalesce); g_free(def->coalesce);
virNetDevIPInfoClear(&def->guestIP); virNetDevIPInfoClear(&def->guestIP);
virNetDevIPInfoClear(&def->hostIP); virNetDevIPInfoClear(&def->hostIP);
virDomainDeviceInfoClear(&def->info); virDomainDeviceInfoClear(&def->info);
VIR_FREE(def->filter); g_free(def->filter);
virHashFree(def->filterparams); virHashFree(def->filterparams);
def->filterparams = NULL; def->filterparams = NULL;
@ -2568,7 +2568,7 @@ virDomainNetDefFree(virDomainNetDefPtr def)
virNetDevVlanClear(&def->vlan); virNetDevVlanClear(&def->vlan);
virObjectUnref(def->privateData); virObjectUnref(def->privateData);
VIR_FREE(def); g_free(def);
} }