[libvirt] [PATCH 07/10] util: storage: adapt to changes in JSON format for NBD
Since 2.9 the host and port for NBD are no longer directly under the
json pseudo-protocol object, but rather belong to a sub-object called
'server'.
---
src/util/virstoragefile.c | 28 +++++++++++++++++-----------
tests/virstoragetest.c | 11 +++++++++++
2 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 4f063e7f2..36e7ca759 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -3010,11 +3010,12 @@ virStorageSourceParseBackingJSONNbd(virStorageSourcePtr src,
const char *host = virJSONValueObjectGetString(json, "host");
const char *port = virJSONValueObjectGetString(json, "port");
const char *export = virJSONValueObjectGetString(json, "export");
+ virJSONValuePtr server = virJSONValueObjectGetObject(json, "server");
- if (!path && !host) {
+ if (!path && !host && !server) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
- _("missing path or host of NBD server in JSON backing "
- "volume definition"));
+ _("missing host specification of NBD server in JSON "
+ "backing volume definition"));
return -1;
}
@@ -3028,17 +3029,22 @@ virStorageSourceParseBackingJSONNbd(virStorageSourcePtr src,
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)
+ if (server) {
+ if (virStorageSourceParseBackingJSONSocketAddress(src->hosts, server) < 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 (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;
+ if (VIR_STRDUP(src->hosts[0].port, port) < 0)
+ return -1;
+ }
}
return 0;
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index c31f4fc54..443d9c6ec 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -1471,6 +1471,17 @@ mymain(void)
"<source protocol='nbd'
name='blah'>\n"
" <host name='example.org'
port='6000'/>\n"
"</source>\n");
+
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"nbd\","
+
"\"export\":\"blah\","
+ "\"server\": {
\"type\":\"tcp\","
+
"\"host\":\"example.org\","
+
"\"port\":\"6000\""
+ "}"
+ "}"
+ "}",
+ "<source protocol='nbd'
name='blah'>\n"
+ " <host name='example.org'
port='6000'/>\n"
+ "</source>\n");
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"ssh\","
"\"host\":\"example.org\","
"\"port\":\"6000\","
--
2.12.2