[libvirt PATCH 12/15] util: replace VIR_FREE with g_free in all *Dispose() functions

[Laine Stump]

Signed-off-by: Laine Stump <laine at redhat.com>
---
 src/util/virdnsmasq.c   |  2 +-
 src/util/virfilecache.c |  4 ++--
 src/util/virmdev.c      |  2 +-
 src/util/virnvme.c      |  2 +-
 src/util/virpci.c       |  2 +-
 src/util/virresctrl.c   | 40 ++++++++++++++++++++--------------------
 src/util/virscsi.c      |  2 +-
 src/util/virscsivhost.c |  2 +-
 src/util/virusb.c       |  2 +-
 9 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index 653d46bef9..3eee4a5a84 100644
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -604,7 +604,7 @@ dnsmasqCapsDispose(void *obj)
     dnsmasqCapsPtr caps = obj;
 
     virBitmapFree(caps->flags);
-    VIR_FREE(caps->binaryPath);
+    g_free(caps->binaryPath);
 }
 
 static int dnsmasqCapsOnceInit(void)
diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c
index a761a01b25..14b2885505 100644
--- a/src/util/virfilecache.c
+++ b/src/util/virfilecache.c
@@ -74,8 +74,8 @@ virFileCacheDispose(void *obj)
 {
     virFileCachePtr cache = obj;
 
-    VIR_FREE(cache->dir);
-    VIR_FREE(cache->suffix);
+    g_free(cache->dir);
+    g_free(cache->suffix);
 
     virHashFree(cache->table);
 
diff --git a/src/util/virmdev.c b/src/util/virmdev.c
index 1f5c2cba30..db40fe8cc3 100644
--- a/src/util/virmdev.c
+++ b/src/util/virmdev.c
@@ -297,7 +297,7 @@ virMediatedDeviceListDispose(void *obj)
     }
 
     list->count = 0;
-    VIR_FREE(list->devs);
+    g_free(list->devs);
 }
 
 
diff --git a/src/util/virnvme.c b/src/util/virnvme.c
index af297552c1..a1fc9aab57 100644
--- a/src/util/virnvme.c
+++ b/src/util/virnvme.c
@@ -166,7 +166,7 @@ virNVMeDeviceListDispose(void *obj)
     for (i = 0; i < list->count; i++)
         virNVMeDeviceFree(list->devs[i]);
 
-    VIR_FREE(list->devs);
+    g_free(list->devs);
 }
 
 
diff --git a/src/util/virpci.c b/src/util/virpci.c
index b8e8422aa0..8147ce11e9 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -1667,7 +1667,7 @@ virPCIDeviceListDispose(void *obj)
     }
 
     list->count = 0;
-    VIR_FREE(list->devs);
+    g_free(list->devs);
 }
 
 int
diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index 4ee95aa232..29df51c652 100644
--- a/src/util/virresctrl.c
+++ b/src/util/virresctrl.c
@@ -210,18 +210,18 @@ virResctrlInfoDispose(void *obj)
 
         if (level->types) {
             for (j = 0; j < VIR_CACHE_TYPE_LAST; j++)
-                VIR_FREE(level->types[j]);
+                g_free(level->types[j]);
         }
-        VIR_FREE(level->types);
-        VIR_FREE(level);
+        g_free(level->types);
+        g_free(level);
     }
 
     if (resctrl->monitor_info)
         g_strfreev(resctrl->monitor_info->features);
 
-    VIR_FREE(resctrl->membw_info);
-    VIR_FREE(resctrl->levels);
-    VIR_FREE(resctrl->monitor_info);
+    g_free(resctrl->membw_info);
+    g_free(resctrl->levels);
+    g_free(resctrl->monitor_info);
 }
 
 
@@ -396,30 +396,30 @@ virResctrlAllocDispose(void *obj)
                 continue;
 
             for (k = 0; k < type->nsizes; k++)
-                VIR_FREE(type->sizes[k]);
+                g_free(type->sizes[k]);
 
             for (k = 0; k < type->nmasks; k++)
                 virBitmapFree(type->masks[k]);
 
-            VIR_FREE(type->sizes);
-            VIR_FREE(type->masks);
-            VIR_FREE(type);
+            g_free(type->sizes);
+            g_free(type->masks);
+            g_free(type);
         }
-        VIR_FREE(level->types);
-        VIR_FREE(level);
+        g_free(level->types);
+        g_free(level);
     }
 
     if (alloc->mem_bw) {
         virResctrlAllocMemBWPtr mem_bw = alloc->mem_bw;
         for (i = 0; i < mem_bw->nbandwidths; i++)
-            VIR_FREE(mem_bw->bandwidths[i]);
-        VIR_FREE(alloc->mem_bw->bandwidths);
-        VIR_FREE(alloc->mem_bw);
+            g_free(mem_bw->bandwidths[i]);
+        g_free(alloc->mem_bw->bandwidths);
+        g_free(alloc->mem_bw);
     }
 
-    VIR_FREE(alloc->id);
-    VIR_FREE(alloc->path);
-    VIR_FREE(alloc->levels);
+    g_free(alloc->id);
+    g_free(alloc->path);
+    g_free(alloc->levels);
 }
 
 
@@ -429,8 +429,8 @@ virResctrlMonitorDispose(void *obj)
     virResctrlMonitorPtr monitor = obj;
 
     virObjectUnref(monitor->alloc);
-    VIR_FREE(monitor->id);
-    VIR_FREE(monitor->path);
+    g_free(monitor->id);
+    g_free(monitor->path);
 }
 
 
diff --git a/src/util/virscsi.c b/src/util/virscsi.c
index 0c753c075e..2a9f6da76a 100644
--- a/src/util/virscsi.c
+++ b/src/util/virscsi.c
@@ -347,7 +347,7 @@ virSCSIDeviceListDispose(void *obj)
     for (i = 0; i < list->count; i++)
         virSCSIDeviceFree(list->devs[i]);
 
-    VIR_FREE(list->devs);
+    g_free(list->devs);
 }
 
 int
diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c
index 5907edbc7e..b7bf0da1b3 100644
--- a/src/util/virscsivhost.c
+++ b/src/util/virscsivhost.c
@@ -60,7 +60,7 @@ virSCSIVHostDeviceListDispose(void *obj)
     for (i = 0; i < list->count; i++)
         virSCSIVHostDeviceFree(list->devs[i]);
 
-    VIR_FREE(list->devs);
+    g_free(list->devs);
 }
 
 
diff --git a/src/util/virusb.c b/src/util/virusb.c
index ae400de656..6d897600e5 100644
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -434,7 +434,7 @@ virUSBDeviceListDispose(void *obj)
     for (i = 0; i < list->count; i++)
         virUSBDeviceFree(list->devs[i]);
 
-    VIR_FREE(list->devs);
+    g_free(list->devs);
 }
 
 int
-- 
2.29.2