ch: Switch from VIR_FREE to g_free

Author: bryteise

src/ch/ch_cgroup.c

@@ -218,7 +218,7 @@ chRestoreCgroupState(virDomainObjPtr vm)
             virCgroupSetCpusetMems(cgroup_temp, nodeset) < 0)
             goto cleanup;
 
-        VIR_FREE(nodeset);
+        g_free(nodeset);
         virCgroupFree(&cgroup_temp);
     }
 
@@ -231,7 +231,7 @@ chRestoreCgroupState(virDomainObjPtr vm)
             virCgroupSetCpusetMems(cgroup_temp, nodeset) < 0)
             goto cleanup;
 
-        VIR_FREE(nodeset);
+        g_free(nodeset);
         virCgroupFree(&cgroup_temp);
     }
 
@@ -394,8 +394,8 @@ chCgroupEmulatorAllNodesDataFree(chCgroupEmulatorAllNodesDataPtr data)
         return;
 
     virCgroupFree(&data->emulatorCgroup);
-    VIR_FREE(data->emulatorMemMask);
-    VIR_FREE(data);
+    g_free(data->emulatorMemMask);
+    g_free(data);
 }
 
 

src/ch/ch_conf.c

@@ -167,8 +167,8 @@ virCHDriverConfigDispose(void *obj)
 {
     virCHDriverConfigPtr cfg = obj;
 
-    VIR_FREE(cfg->stateDir);
-    VIR_FREE(cfg->logDir);
+    g_free(cfg->stateDir);
+    g_free(cfg->logDir);
 }
 
 static int
@@ -215,7 +215,7 @@ chExtractVersionInfo(int *retversion)
 
  cleanup:
     virCommandFree(cmd);
-    VIR_FREE(help);
+    g_free(help);
 
     return ret;
 }

src/ch/ch_driver.c

@@ -948,7 +948,7 @@ static int chStateCleanup(void)
     virObjectUnref(ch_driver->config);
     virObjectUnref(ch_driver->hostdevMgr);
     virMutexDestroy(&ch_driver->lock);
-    VIR_FREE(ch_driver);
+    g_free(ch_driver);
 
     return 0;
 }
@@ -974,7 +974,7 @@ static int chStateInitialize(bool privileged,
         return VIR_DRV_STATE_INIT_ERROR;
 
     if (virMutexInit(&ch_driver->lock) < 0) {
-        VIR_FREE(ch_driver);
+        g_free(ch_driver);
         return VIR_DRV_STATE_INIT_ERROR;
     }
 

src/ch/ch_monitor.c

@@ -1308,7 +1308,7 @@ void virCHMonitorClose(virCHMonitorPtr mon)
             VIR_WARN("Unable to remove CH monitor file '%s'",
                      mon->monitorpath);
         }
-        VIR_FREE(mon->monitorpath);
+        g_free(mon->monitorpath);
     }
 
     virCHMonitorStopEventLoop(mon);