提交 6402f402 编写于 作者: P Peter Krempa

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.
上级 506b80c8
...@@ -2795,8 +2795,8 @@ virStorageSourceParseBackingJSONUri(virStorageSourcePtr src, ...@@ -2795,8 +2795,8 @@ virStorageSourceParseBackingJSONUri(virStorageSourcePtr src,
static int static int
virStorageSourceParseBackingJSONGlusterHost(virStorageNetHostDefPtr host, virStorageSourceParseBackingJSONSocketAddress(virStorageNetHostDefPtr host,
virJSONValuePtr json) virJSONValuePtr json)
{ {
const char *type = virJSONValueObjectGetString(json, "type"); const char *type = virJSONValueObjectGetString(json, "type");
const char *hostname = virJSONValueObjectGetString(json, "host"); const char *hostname = virJSONValueObjectGetString(json, "host");
...@@ -2817,7 +2817,7 @@ virStorageSourceParseBackingJSONGlusterHost(virStorageNetHostDefPtr host, ...@@ -2817,7 +2817,7 @@ virStorageSourceParseBackingJSONGlusterHost(virStorageNetHostDefPtr host,
if (!hostname) { if (!hostname) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing hostname for tcp backing server in " _("missing hostname for tcp backing server in "
"JSON backing definition for gluster volume")); "JSON backing volume definition"));
return -1; return -1;
} }
...@@ -2830,7 +2830,7 @@ virStorageSourceParseBackingJSONGlusterHost(virStorageNetHostDefPtr host, ...@@ -2830,7 +2830,7 @@ virStorageSourceParseBackingJSONGlusterHost(virStorageNetHostDefPtr host,
if (!socket) { if (!socket) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing socket path for udp backing server in " _("missing socket path for udp backing server in "
"JSON backing definition for gluster volume")); "JSON backing volume definition"));
return -1; return -1;
} }
...@@ -2897,8 +2897,8 @@ virStorageSourceParseBackingJSONGluster(virStorageSourcePtr src, ...@@ -2897,8 +2897,8 @@ virStorageSourceParseBackingJSONGluster(virStorageSourcePtr src,
src->nhosts = nservers; src->nhosts = nservers;
for (i = 0; i < nservers; i++) { for (i = 0; i < nservers; i++) {
if (virStorageSourceParseBackingJSONGlusterHost(src->hosts + i, if (virStorageSourceParseBackingJSONSocketAddress(src->hosts + i,
virJSONValueArrayGet(server, i)) < 0) virJSONValueArrayGet(server, i)) < 0)
return -1; return -1;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册