[libvirt] [PATCH 03/10] util: storage: make virStorageSourceParseBackingJSONGlusterHost universal
The same json strucutre is used for NBD and sheepdog volumes for
specifying of the host. Rename the function and fix up error messages to
be more universal.
---
src/util/virstoragefile.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 6b0af521f..92bc561a2 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2795,8 +2795,8 @@ virStorageSourceParseBackingJSONUri(virStorageSourcePtr src,
static int
-virStorageSourceParseBackingJSONGlusterHost(virStorageNetHostDefPtr host,
- virJSONValuePtr json)
+virStorageSourceParseBackingJSONSocketAddress(virStorageNetHostDefPtr host,
+ virJSONValuePtr json)
{
const char *type = virJSONValueObjectGetString(json, "type");
const char *hostname = virJSONValueObjectGetString(json, "host");
@@ -2817,7 +2817,7 @@ virStorageSourceParseBackingJSONGlusterHost(virStorageNetHostDefPtr
host,
if (!hostname) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing hostname for tcp backing server in "
- "JSON backing definition for gluster volume"));
+ "JSON backing volume definition"));
return -1;
}
@@ -2830,7 +2830,7 @@ virStorageSourceParseBackingJSONGlusterHost(virStorageNetHostDefPtr
host,
if (!socket) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing socket path for udp backing server in "
- "JSON backing definition for gluster volume"));
+ "JSON backing volume definition"));
return -1;
}
@@ -2897,8 +2897,8 @@ virStorageSourceParseBackingJSONGluster(virStorageSourcePtr src,
src->nhosts = nservers;
for (i = 0; i < nservers; i++) {
- if (virStorageSourceParseBackingJSONGlusterHost(src->hosts + i,
- virJSONValueArrayGet(server, i))
< 0)
+ if (virStorageSourceParseBackingJSONSocketAddress(src->hosts + i,
+ virJSONValueArrayGet(server,
i)) < 0)
return -1;
}
--
2.12.2