qemu: Use virDomainChrSourceDefNew for monConfig

Rather than VIR_ALLOC, use the New function for allocation. We
already use the Free function anyway.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Laine Stump <laine@laine.org>
Reviewed-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index caf3f47c6304604f171515d528e2eebdf14a6e48..fd57364cd4248805176738eb647f60e8be3ab99c 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -12211,7 +12211,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
 }
 
 
-static virDomainChrSourceDefPtr
+virDomainChrSourceDefPtr
 virDomainChrSourceDefNew(virDomainXMLOptionPtr xmlopt)
 {
     virDomainChrSourceDefPtr def = NULL;

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 68473c309e72bb3c0955688588b717ec0491d217..89a7131fdbcfada2329a09e8dd9b7b6a80976ebf 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2827,6 +2827,9 @@ bool virDomainDefHasDeviceAddress(virDomainDefPtr def,
 
 void virDomainDefFree(virDomainDefPtr vm);
 
+virDomainChrSourceDefPtr
+virDomainChrSourceDefNew(virDomainXMLOptionPtr xmlopt);
+
 virDomainChrDefPtr virDomainChrDefNew(virDomainXMLOptionPtr xmlopt);
 
 virDomainDefPtr virDomainDefNew(void);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index c550310cc01f7987e60577c6bf79c48ec2503ddd..cab324c4d709a39e970d11f125f54535412f50a7 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -218,6 +218,7 @@ virDomainChrSourceDefClear;
 virDomainChrSourceDefCopy;
 virDomainChrSourceDefFree;
 virDomainChrSourceDefGetPath;
+virDomainChrSourceDefNew;
 virDomainChrSpicevmcTypeFromString;
 virDomainChrSpicevmcTypeToString;
 virDomainChrTcpProtocolTypeFromString;

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 0486c5527dc568861bf35bf7bb81626b6377563e..100304fd053f181b3ea5ca00007c6ed5aab3cdab 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2422,7 +2422,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
     xmlNodePtr node = NULL;
     virQEMUCapsPtr qemuCaps = NULL;
 
-    if (VIR_ALLOC(priv->monConfig) < 0)
+    if (!(priv->monConfig = virDomainChrSourceDefNew(NULL)))
         goto error;
 
     if (!(monitorpath =

diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c
index 5fe3f97d03eba723de8cb7a159b17c5cdb979052..5f27d296b311ed2a74d120f70f4a466b6aaa8ae4 100644 (file)
--- a/src/qemu/qemu_parse_command.c
+++ b/src/qemu/qemu_parse_command.c
@@ -2484,7 +2484,7 @@ qemuParseCommandLine(virCapsPtr caps,
             if (monConfig) {
                 virDomainChrSourceDefPtr chr;
 
-                if (VIR_ALLOC(chr) < 0)
+                if (!(chr = virDomainChrSourceDefNew(NULL)))
                     goto error;
 
                 if (qemuParseCommandLineChr(chr, val) < 0) {

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 159618636603a8ec7d48f1e8e7fee95ae9ba21a8..add4e5a74338763af88d97b0a6245148f2c9229c 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5717,7 +5717,7 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver,
             goto cleanup;
     }
 
-    if (VIR_ALLOC(priv->monConfig) < 0)
+    if (!(priv->monConfig = virDomainChrSourceDefNew(NULL)))
         goto cleanup;
 
     VIR_DEBUG("Preparing monitor state");