aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaine Stump <laine@laine.org>2011-08-10 23:34:07 -0400
committerLaine Stump <laine@laine.org>2012-03-09 04:53:10 -0500
commitb5893b7b64d5f748ec36e52594328beb9bbef099 (patch)
treed08bfd543e1c279b789190f8ebd0834341a85978
parentqemuxml2argvtest: Pass some additional flags to graphics-spice-agentmouse (diff)
downloadlibvirt-b5893b7b64d5f748ec36e52594328beb9bbef099.tar.gz
libvirt-b5893b7b64d5f748ec36e52594328beb9bbef099.tar.bz2
libvirt-b5893b7b64d5f748ec36e52594328beb9bbef099.zip
conf: eliminate redundant VIR_ALLOC of 1st element of network DNS hosts.
virNetworkDNSHostsDefParseXML was calling VIR_ALLOC(def->hosts) if def->hosts was NULL. This is a waste of time, though, since VIR_REALLOC_N is called a few lines further down, prior to any use of def->hosts. (initializing def->nhosts to 0 is also redundant, because the newly allocated memory will always be cleared to all 0's anyway).
-rw-r--r--src/conf/network_conf.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 743ae9293..033314130 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -510,14 +510,6 @@ virNetworkDNSHostsDefParseXML(virNetworkDNSDefPtr def,
virSocketAddr inaddr;
int ret = -1;
- if (def->hosts == NULL) {
- if (VIR_ALLOC(def->hosts) < 0) {
- virReportOOMError();
- goto error;
- }
- def->nhosts = 0;
- }
-
if (!(ip = virXMLPropString(node, "ip")) ||
(virSocketAddrParse(&inaddr, ip, AF_UNSPEC) < 0)) {
virNetworkReportError(VIR_ERR_XML_DETAIL,