From 1b72e7eada1d446f6ff981a21fb822c3a60110c0 Mon Sep 17 00:00:00 2001 Message-Id: <1b72e7eada1d446f6ff981a21fb822c3a60110c0@dist-git> From: Peter Krempa Date: Tue, 16 Aug 2016 13:35:12 +0200 Subject: [PATCH] utils: storage: Fix JSON field name for uri based storage qemu uses 'url' instead of 'uri'. They unfortunately look very similar. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1367260 (cherry picked from commit c2e12b01baaf660abcf87f4a6f470862ac7aca15) --- src/util/virstoragefile.c | 4 ++-- tests/virstoragetest.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 6f7d131..471aa1f 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -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; } diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 3b19f59..b3d59ad 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -1377,19 +1377,19 @@ mymain(void) "\"file.filename\":\"/path/to/cdrom\"}", "\n"); TEST_BACKING_PARSE("json:{\"file.driver\":\"http\", " - "\"file.uri\":\"http://example.com/file\"}", + "\"file.url\":\"http://example.com/file\"}", "\n" " \n" "\n"); TEST_BACKING_PARSE("json:{\"file\":{ \"driver\":\"http\"," - "\"uri\":\"http://example.com/file\"" + "\"url\":\"http://example.com/file\"" "}" "}", "\n" " \n" "\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\"}", -- 2.9.2