]> xenbits.xensource.com Git - libvirt.git/commitdiff
conf: don't bother setting pointers to NULL in vir*Free() functions
authorLaine Stump <laine@redhat.com>
Wed, 27 Jan 2021 02:23:06 +0000 (21:23 -0500)
committerLaine Stump <laine@redhat.com>
Tue, 2 Feb 2021 05:27:58 +0000 (00:27 -0500)
The memory containing the pointer is going to be freed momentarily anyway.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/conf/domain_conf.c
src/conf/node_device_conf.c

index c16036f5d8ff421a5ea3d3c9d17f278706f709ff..658f563b36b597a014df3417259b53164bdf879a 100644 (file)
@@ -1908,7 +1908,6 @@ virDomainVcpuDefFree(virDomainVcpuDefPtr info)
         return;
 
     virBitmapFree(info->cpumask);
-    info->cpumask = NULL;
     virObjectUnref(info->privateData);
     VIR_FREE(info);
 }
@@ -2474,7 +2473,6 @@ virDomainNetDefFree(virDomainNetDefPtr def)
     switch (def->type) {
     case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
         virObjectUnref(def->data.vhostuser);
-        def->data.vhostuser = NULL;
         break;
 
     case VIR_DOMAIN_NET_TYPE_VDPA:
@@ -2493,7 +2491,6 @@ virDomainNetDefFree(virDomainNetDefPtr def)
         g_free(def->data.network.name);
         g_free(def->data.network.portgroup);
         virDomainActualNetDefFree(def->data.network.actual);
-        def->data.network.actual = NULL;
         break;
 
     case VIR_DOMAIN_NET_TYPE_BRIDGE:
@@ -2537,10 +2534,8 @@ virDomainNetDefFree(virDomainNetDefPtr def)
 
     g_free(def->filter);
     virHashFree(def->filterparams);
-    def->filterparams = NULL;
 
     virNetDevBandwidthFree(def->bandwidth);
-    def->bandwidth = NULL;
     virNetDevVlanClear(&def->vlan);
 
     virObjectUnref(def->privateData);
index 35f34b10e98a04d99e3ebf747d5783c1605bf133..b6f73161b5ce86ac689fbd32638058222bca29a1 100644 (file)
@@ -2422,7 +2422,6 @@ virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps)
         VIR_FREE(data->net.ifname);
         VIR_FREE(data->net.address);
         virBitmapFree(data->net.features);
-        data->net.features = NULL;
         break;
     case VIR_NODE_DEV_CAP_SCSI_HOST:
         VIR_FREE(data->scsi_host.wwnn);