[libvirt PATCH 01/21] conf: replace remaining straggler VIR_FREE with g_free in vir*Free()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



I missed a few in commit f9f81f1c

Signed-off-by: Laine Stump <laine@xxxxxxxxxx>
---
 src/conf/domain_conf.c             |  6 +++---
 src/conf/numa_conf.c               | 10 +++++-----
 src/conf/storage_encryption_conf.c |  2 +-
 src/conf/virchrdev.c               |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 12ebdb37f4..3f71297283 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -26528,7 +26528,7 @@ virDomainRNGDefFree(virDomainRNGDefPtr def)
 
     switch ((virDomainRNGBackend) def->backend) {
     case VIR_DOMAIN_RNG_BACKEND_RANDOM:
-        VIR_FREE(def->source.file);
+        g_free(def->source.file);
         break;
     case VIR_DOMAIN_RNG_BACKEND_EGD:
         virObjectUnref(def->source.chardev);
@@ -26539,8 +26539,8 @@ virDomainRNGDefFree(virDomainRNGDefPtr def)
     }
 
     virDomainDeviceInfoClear(&def->info);
-    VIR_FREE(def->virtio);
-    VIR_FREE(def);
+    g_free(def->virtio);
+    g_free(def);
 }
 
 
diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c
index f8a7a01ac9..338d779e90 100644
--- a/src/conf/numa_conf.c
+++ b/src/conf/numa_conf.c
@@ -416,15 +416,15 @@ virDomainNumaFree(virDomainNumaPtr numa)
         virBitmapFree(numa->mem_nodes[i].nodeset);
 
         if (numa->mem_nodes[i].ndistances > 0)
-            VIR_FREE(numa->mem_nodes[i].distances);
+            g_free(numa->mem_nodes[i].distances);
 
-        VIR_FREE(numa->mem_nodes[i].caches);
+        g_free(numa->mem_nodes[i].caches);
     }
-    VIR_FREE(numa->mem_nodes);
+    g_free(numa->mem_nodes);
 
-    VIR_FREE(numa->interconnects);
+    g_free(numa->interconnects);
 
-    VIR_FREE(numa);
+    g_free(numa);
 }
 
 /**
diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c
index 7fd0df70a9..e2ae7f7b51 100644
--- a/src/conf/storage_encryption_conf.c
+++ b/src/conf/storage_encryption_conf.c
@@ -64,7 +64,7 @@ virStorageEncryptionSecretFree(virStorageEncryptionSecretPtr secret)
     if (!secret)
         return;
     virSecretLookupDefClear(&secret->seclookupdef);
-    VIR_FREE(secret);
+    g_free(secret);
 }
 
 void
diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c
index d356a1babf..e5257650d4 100644
--- a/src/conf/virchrdev.c
+++ b/src/conf/virchrdev.c
@@ -223,8 +223,8 @@ static void virChrdevFDStreamCloseCbFree(void *opaque)
 {
     virChrdevStreamInfoPtr priv = opaque;
 
-    VIR_FREE(priv->path);
-    VIR_FREE(priv);
+    g_free(priv->path);
+    g_free(priv);
 }
 
 /**
@@ -304,7 +304,7 @@ void virChrdevFree(virChrdevsPtr devs)
     virMutexUnlock(&devs->lock);
     virMutexDestroy(&devs->lock);
 
-    VIR_FREE(devs);
+    g_free(devs);
 }
 
 /**
-- 
2.29.2




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux