[RFC 28/29] conf: Apply virNetworkDNSHostDefFormatBuf(generated) in virNetworkDNSDefFormat
Signed-off-by: Shi Lei <shi_lei(a)massclouds.com>
---
docs/schemas/network.rng | 1 +
src/conf/network_conf.c | 15 +++------------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng
index b97510f..ba5db0b 100644
--- a/docs/schemas/network.rng
+++ b/docs/schemas/network.rng
@@ -385,6 +385,7 @@
{"name": "partialOkay", "type":
"Bool"}
]
},
+ "formatfunc": {"output":
"src/conf/network_conf"},
"members": [
{"id": "ip", "opt": true},
{"id": "hostname", "name":
"name", "opt": true}
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 1e8bfbc..e5d6e49 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -1926,7 +1926,7 @@ static int
virNetworkDNSDefFormat(virBufferPtr buf,
const virNetworkDNSDef *def)
{
- size_t i, j;
+ size_t i;
if (!(def->enable || def->forwardPlainNames || def->nforwarders ||
def->nhosts ||
def->nsrvs || def->ntxts))
@@ -1981,17 +1981,8 @@ virNetworkDNSDefFormat(virBufferPtr buf,
if (def->nhosts) {
for (i = 0; i < def->nhosts; i++) {
- char *ip = virSocketAddrFormat(&def->hosts[i].ip);
-
- virBufferAsprintf(buf, "<host ip='%s'>\n", ip);
- virBufferAdjustIndent(buf, 2);
- for (j = 0; j < def->hosts[i].nnames; j++)
- virBufferEscapeString(buf,
"<hostname>%s</hostname>\n",
- def->hosts[i].names[j]);
-
- virBufferAdjustIndent(buf, -2);
- virBufferAddLit(buf, "</host>\n");
- VIR_FREE(ip);
+ if (virNetworkDNSHostDefFormatBuf(buf, "host",
&def->hosts[i]) < 0)
+ return -1;
}
}
virBufferAdjustIndent(buf, -2);
--
2.17.1