NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2026-09-03 20:53:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

util: storage: Always deflatten JSON pseudo-protocol objects

Browse Source 
Now that the JSON deflattener is working sanely we can always attempt
the deflattening so that we can then parse the tree as expected.
This commit is contained in:
Peter Krempa
2017-07-11 14:23:08 +02:00
parent 428d175206
commit 6d7cdec63d
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/virstoragefile.c
+10 -12
View File
@@ -3249,24 +3249,22 @@ static int
virStorageSourceParseBackingJSONInternal(virStorageSourcePtr src, virStorageSourceParseBackingJSONInternal(virStorageSourcePtr src,
virJSONValuePtr json) virJSONValuePtr json)
{ {
virJSONValuePtr fixedroot = NULL; virJSONValuePtr deflattened = NULL;
virJSONValuePtr file; virJSONValuePtr file;
const char *drvname; const char *drvname;
char *str = NULL; char *str = NULL;
size_t i; size_t i;
int ret = -1; int ret = -1;
if (!(file = virJSONValueObjectGetObject(json, "file"))) { if (!(deflattened = virJSONValueObjectDeflatten(json)))
if (!(fixedroot = virJSONValueObjectDeflatten(json))) goto cleanup;
goto cleanup;
if (!(file = virJSONValueObjectGetObject(fixedroot, "file"))) { if (!(file = virJSONValueObjectGetObject(deflattened, "file"))) {
str = virJSONValueToString(json, false); str = virJSONValueToString(json, false);
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("JSON backing volume defintion '%s' lacks 'file' object"), _("JSON backing volume defintion '%s' lacks 'file' object"),
NULLSTR(str)); NULLSTR(str));
goto cleanup; goto cleanup;
}
} }
if (!(drvname = virJSONValueObjectGetString(file, "driver"))) { if (!(drvname = virJSONValueObjectGetString(file, "driver"))) {
@@ -3290,7 +3288,7 @@ virStorageSourceParseBackingJSONInternal(virStorageSourcePtr src,
cleanup: cleanup:
VIR_FREE(str); VIR_FREE(str);
virJSONValueFree(fixedroot); virJSONValueFree(deflattened);
return ret; return ret;
} }