External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-01 20:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

utils: storage: Fix JSON field name for uri based storage

Browse Source 
qemu uses 'url' instead of 'uri'. They unfortunately look very similar.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1367260
This commit is contained in:
Peter Krempa 2016-08-16 09:24:12 +02:00
parent ef66bd5df8
commit c2e12b01ba
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/util/virstoragefile.c
View File

@ -2684,9 +2684,9 @@ virStorageSourceParseBackingJSONUri(virStorageSourcePtr src,
{
const char *uri;
if (!(uri = virJSONValueObjectGetString(json, "uri"))) {
if (!(uri = virJSONValueObjectGetString(json, "url"))) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing URI in JSON backing volume definition"));
_("missing 'url' in JSON backing volume definition"));
return -1;
}

6
tests/virstoragetest.c
View File

@ -1377,19 +1377,19 @@ mymain(void)
"\"file.filename\":\"/path/to/cdrom\"}",
"<source dev='/path/to/cdrom'/>\n");
TEST_BACKING_PARSE("json:{\"file.driver\":\"http\", "
"\"file.uri\":\"http://example.com/file\"}",
"\"file.url\":\"http://example.com/file\"}",
"<source protocol='http' name='file'>\n"
" <host name='example.com'/>\n"
"</source>\n");
TEST_BACKING_PARSE("json:{\"file\":{ \"driver\":\"http\","
"\"uri\":\"http://example.com/file\""
"\"url\":\"http://example.com/file\""
"}"
"}",
"<source protocol='http' name='file'>\n"
" <host name='example.com'/>\n"
"</source>\n");
TEST_BACKING_PARSE("json:{\"file.driver\":\"ftp\", "
"\"file.uri\":\"http://example.com/file\"}",
"\"file.url\":\"http://example.com/file\"}",
NULL);
TEST_BACKING_PARSE("json:{\"file.driver\":\"gluster\", "
"\"file.filename\":\"gluster://example.com/vol/file\"}",