[libvirt] [PATCH 08/25] util: storage: Add JSON backing volume parser for 'nbd' protocol
---
src/util/virstoragefile.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
tests/virstoragetest.c | 14 ++++++++++++++
2 files changed, 59 insertions(+)
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 9fc260b..c4dcd48 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2702,6 +2702,50 @@ virStorageSourceParseBackingJSONiSCSI(virStorageSourcePtr src,
}
+static int
+virStorageSourceParseBackingJSONNbd(virStorageSourcePtr src,
+ virJSONValuePtr json,
+ int opaque ATTRIBUTE_UNUSED)
+{
+ const char *path = virJSONValueObjectGetString(json, "file.path");
+ const char *host = virJSONValueObjectGetString(json, "file.host");
+ const char *port = virJSONValueObjectGetString(json, "file.port");
+ const char *export = virJSONValueObjectGetString(json, "file.export");
+
+ if (!path && !host) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("missing path or host of NBD server in JSON backing "
+ "volume definition"));
+ return -1;
+ }
+
+ src->type = VIR_STORAGE_TYPE_NETWORK;
+ src->protocol = VIR_STORAGE_NET_PROTOCOL_NBD;
+
+ if (VIR_STRDUP(src->path, export) < 0)
+ return -1;
+
+ if (VIR_ALLOC_N(src->hosts, 1) < 0)
+ return -1;
+ src->nhosts = 1;
+
+ if (path) {
+ src->hosts[0].transport = VIR_STORAGE_NET_HOST_TRANS_UNIX;
+ if (VIR_STRDUP(src->hosts[0].socket, path) < 0)
+ return -1;
+ } else {
+ src->hosts[0].transport = VIR_STORAGE_NET_HOST_TRANS_TCP;
+ if (VIR_STRDUP(src->hosts[0].name, host) < 0)
+ return -1;
+
+ if (VIR_STRDUP(src->hosts[0].port, port) < 0)
+ return -1;
+ }
+
+ return 0;
+}
+
+
struct virStorageSourceJSONDriverParser {
const char *drvname;
int (*func)(virStorageSourcePtr src, virJSONValuePtr json, int opaque);
@@ -2719,6 +2763,7 @@ static const struct virStorageSourceJSONDriverParser jsonParsers[] =
{
{"tftp", virStorageSourceParseBackingJSONUri,
VIR_STORAGE_NET_PROTOCOL_TFTP},
{"gluster", virStorageSourceParseBackingJSONGluster, 0},
{"iscsi", virStorageSourceParseBackingJSONiSCSI, 0},
+ {"nbd", virStorageSourceParseBackingJSONNbd, 0},
};
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index 4ebc1c5..220143e 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -1402,6 +1402,20 @@ mymain(void)
" <host transport='unix'
socket='/path/socket'/>\n"
" <host name='example.com'/>\n"
"</source>\n");
+ TEST_BACKING_PARSE("json:{\"file.driver\":\"nbd\","
+
"\"file.path\":\"/path/to/socket\""
+ "}",
+ "<source protocol='nbd'>\n"
+ " <host transport='unix'
socket='/path/to/socket'/>\n"
+ "</source>\n");
+ TEST_BACKING_PARSE("json:{\"file.driver\":\"nbd\","
+ "\"file.export\":\"blah\","
+
"\"file.host\":\"example.org\","
+ "\"file.port\":\"6000\""
+ "}",
+ "<source protocol='nbd'
name='blah'>\n"
+ " <host name='example.org'
port='6000'/>\n"
+ "</source>\n");
cleanup:
/* Final cleanup */
--
2.9.0