[libvirt] [PATCH 2/2] util: storage: Add json pseudo protocol support for legacy RBD strings
RBD in qemu still uses only the legacy 'filename' syntax.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1371758
---
src/util/virstoragefile.c | 23 +++++++++++++++++++++++
tests/virstoragetest.c | 6 ++++++
2 files changed, 29 insertions(+)
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 02cae66..41827f0 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2940,6 +2940,28 @@ virStorageSourceParseBackingJSONSSH(virStorageSourcePtr src,
}
+static int
+virStorageSourceParseBackingJSONRBD(virStorageSourcePtr src,
+ virJSONValuePtr json,
+ int opaque ATTRIBUTE_UNUSED)
+{
+ const char *filename;
+
+ src->type = VIR_STORAGE_TYPE_NETWORK;
+ src->protocol = VIR_STORAGE_NET_PROTOCOL_RBD;
+
+ /* legacy syntax passed via 'filename' option */
+ if ((filename = virJSONValueObjectGetString(json, "filename")))
+ return virStorageSourceParseRBDColonString(filename, src);
+
+ /* RBD currently supports only URI syntax passed in as filename */
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("missing RBD filename in JSON backing volume
definition"));
+
+ return -1;
+}
+
+
struct virStorageSourceJSONDriverParser {
const char *drvname;
int (*func)(virStorageSourcePtr src, virJSONValuePtr json, int opaque);
@@ -2960,6 +2982,7 @@ static const struct virStorageSourceJSONDriverParser jsonParsers[] =
{
{"nbd", virStorageSourceParseBackingJSONNbd, 0},
{"sheepdog", virStorageSourceParseBackingJSONSheepdog, 0},
{"ssh", virStorageSourceParseBackingJSONSSH, 0},
+ {"rbd", virStorageSourceParseBackingJSONRBD, 0},
};
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index fd79abb..f766df1 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -1486,6 +1486,12 @@ mymain(void)
"<source protocol='ssh'
name='blah'>\n"
" <host name='example.org'
port='6000'/>\n"
"</source>\n");
+ TEST_BACKING_PARSE("json:{\"file.driver\":\"rbd\","
+
"\"file.filename\":\"rbd:testshare:id=asdf:mon_host=example.com\""
+ "}",
+ "<source protocol='rbd'
name='testshare'>\n"
+ " <host name='example.com'/>\n"
+ "</source>\n");
cleanup:
/* Final cleanup */
--
2.9.2