qemu: Replace virDomainChrSourceDefFree with virObjectUnref

Replace virDomainChrSourceDefFree with virObjectUnref.

Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>

diff --git a/cfg.mk b/cfg.mk
index c2524de5fc6ba5d28f95d72ad41042638010e686..7762422da76481aee91505d375f00d944d53a54f 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -120,7 +120,6 @@ useless_free_options = \
   --name=virConfFreeValue \
   --name=virDomainActualNetDefFree \
   --name=virDomainChrDefFree \
-  --name=virDomainChrSourceDefFree \
   --name=virDomainControllerDefFree \
   --name=virDomainDefFree \
   --name=virDomainDeviceDefFree \

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 6f96e6bcdb0d72e75ebaaadf150295078fbe9916..477deb777e2bf3fc627ea7bedeec0aa986a738ec 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2199,7 +2199,7 @@ virDomainNetDefClear(virDomainNetDefPtr def)
 
     switch (def->type) {
     case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
-        virDomainChrSourceDefFree(def->data.vhostuser);
+        virObjectUnref(def->data.vhostuser);
         def->data.vhostuser = NULL;
         break;
 
@@ -2438,13 +2438,6 @@ virDomainChrSourceDefDispose(void *obj)
 }
 
 
-void
-virDomainChrSourceDefFree(virDomainChrSourceDefPtr def)
-{
-    virObjectUnref(def);
-}
-
-
 /* virDomainChrSourceDefIsEqual:
  * @src: Source
  * @tgt: Target
@@ -2535,7 +2528,7 @@ void virDomainChrDefFree(virDomainChrDefPtr def)
         break;
     }
 
-    virDomainChrSourceDefFree(def->source);
+    virObjectUnref(def->source);
     virDomainDeviceInfoClear(&def->info);
 
     VIR_FREE(def);
@@ -2558,7 +2551,7 @@ void virDomainSmartcardDefFree(virDomainSmartcardDefPtr def)
         break;
 
     case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH:
-        virDomainChrSourceDefFree(def->data.passthru);
+        virObjectUnref(def->data.passthru);
         break;
 
     default:
@@ -2817,7 +2810,7 @@ void virDomainRedirdevDefFree(virDomainRedirdevDefPtr def)
     if (!def)
         return;
 
-    virDomainChrSourceDefFree(def->source);
+    virObjectUnref(def->source);
     virDomainDeviceInfoClear(&def->info);
 
     VIR_FREE(def);
@@ -26540,7 +26533,7 @@ virDomainRNGDefFree(virDomainRNGDefPtr def)
         VIR_FREE(def->source.file);
         break;
     case VIR_DOMAIN_RNG_BACKEND_EGD:
-        virDomainChrSourceDefFree(def->source.chardev);
+        virObjectUnref(def->source.chardev);
         break;
     case VIR_DOMAIN_RNG_BACKEND_LAST:
         break;

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 1036eb9b10cf1a93bca3db17287c3b9328b8bc46..1f8454b38cc36f51dd094de07c7f5db6e39c47e0 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2926,7 +2926,6 @@ void virDomainNetDefClear(virDomainNetDefPtr def);
 void virDomainNetDefFree(virDomainNetDefPtr def);
 void virDomainSmartcardDefFree(virDomainSmartcardDefPtr def);
 void virDomainChrDefFree(virDomainChrDefPtr def);
-void virDomainChrSourceDefFree(virDomainChrSourceDefPtr def);
 int virDomainChrSourceDefCopy(virDomainChrSourceDefPtr dest,
                               virDomainChrSourceDefPtr src);
 void virDomainSoundCodecDefFree(virDomainSoundCodecDefPtr def);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index aa1b2c77bef543eb8d1a9b0c5802912dfdf76122..038a7449811a8433cfe7104c1df9ca9e492d9272 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -221,7 +221,6 @@ virDomainChrSerialTargetTypeFromString;
 virDomainChrSerialTargetTypeToString;
 virDomainChrSourceDefClear;
 virDomainChrSourceDefCopy;
-virDomainChrSourceDefFree;
 virDomainChrSourceDefGetPath;
 virDomainChrSourceDefNew;
 virDomainChrSpicevmcTypeFromString;

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index c793c166685df872f4cb03838468aeb5e18d260d..55bb0ab5aa2242207ab319c52e146145233d60d0 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2063,7 +2063,7 @@ qemuDomainObjPrivateFree(void *data)
 
     qemuDomainObjPrivateDataClear(priv);
 
-    virDomainChrSourceDefFree(priv->monConfig);
+    virObjectUnref(priv->monConfig);
     qemuDomainObjFreeJob(priv);
     VIR_FREE(priv->lockState);
     VIR_FREE(priv->origname);
@@ -3073,7 +3073,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
     VIR_FREE(tmp);
     virBitmapFree(priv->namespaces);
     priv->namespaces = NULL;
-    virDomainChrSourceDefFree(priv->monConfig);
+    virObjectUnref(priv->monConfig);
     priv->monConfig = NULL;
     virStringListFree(priv->qemuDevices);
     priv->qemuDevices = NULL;

diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c
index 81691cb85ee17b7e6d7406177e4eea559633ca4b..49b34b1c178e7cf7996dffe3c847b73f5a0169a6 100644 (file)
--- a/src/qemu/qemu_parse_command.c
+++ b/src/qemu/qemu_parse_command.c
@@ -2495,7 +2495,7 @@ qemuParseCommandLine(virFileCachePtr capsCache,
                     goto error;
 
                 if (qemuParseCommandLineChr(chr, val) < 0) {
-                    virDomainChrSourceDefFree(chr);
+                    virObjectUnref(chr);
                     goto error;
                 }
 
@@ -2732,7 +2732,7 @@ qemuParseCommandLine(virFileCachePtr capsCache,
     virStringListFree(list);
     VIR_FREE(nics);
     if (monConfig) {
-        virDomainChrSourceDefFree(*monConfig);
+        virObjectUnref(*monConfig);
         *monConfig = NULL;
     }
     if (pidfile)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index f06fe62f993138c0707a53a9828ace845f65341d..68c670d3f2e5e329fbce93ffa5279d98d2616410 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1887,8 +1887,7 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob,
     virObjectRef(vm);
 
     ignore_value(virTimeMillisNow(&priv->monStart));
-    monConfig = priv->monConfig;
-    virObjectRef(monConfig);
+    monConfig = virObjectRef(priv->monConfig);
     virObjectUnlock(vm);
 
     mon = qemuMonitorOpen(vm,
@@ -7184,7 +7183,7 @@ void qemuProcessStop(virQEMUDriverPtr driver,
     if (priv->monConfig) {
         if (priv->monConfig->type == VIR_DOMAIN_CHR_TYPE_UNIX)
             unlink(priv->monConfig->data.nix.path);
-        virDomainChrSourceDefFree(priv->monConfig);
+        virObjectUnref(priv->monConfig);
         priv->monConfig = NULL;
     }