External/libvirt
1
0
Fork 0
Code

virStorageSourceParseBackingJSONRaw: Parse 'offset' and 'size' attributes

Browse Source 
If the parsed 'raw' format JSON string has 'offset' or 'size' attributes
parse them as the format slice.

https://bugzilla.redhat.com/show_bug.cgi?id=1791788

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-02-05 18:09:55 +01:00
parent 293e7750c9
commit e8a819e87f
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/util/virstoragefile.c
View File

@ -3551,8 +3551,28 @@ virStorageSourceParseBackingJSONRaw(virStorageSourcePtr src,
const char *jsonstr, const char *jsonstr,
int opaque G_GNUC_UNUSED) int opaque G_GNUC_UNUSED)
{ {
bool has_offset = virJSONValueObjectHasKey(json, "offset");
bool has_size = virJSONValueObjectHasKey(json, "size");
virJSONValuePtr file; virJSONValuePtr file;
if (has_offset || has_size) {
src->sliceStorage = g_new0(virStorageSourceSlice, 1);
if (has_offset &&
virJSONValueObjectGetNumberUlong(json, "offset", &src->sliceStorage->offset) < 0) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("malformed 'offset' property of 'raw' driver"));
return -1;
}
if (has_size &&
virJSONValueObjectGetNumberUlong(json, "size", &src->sliceStorage->size) < 0) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("malformed 'size' property of 'raw' driver"));
return -1;
}
}
/* 'raw' is a format driver so it can have protocol driver children */ /* 'raw' is a format driver so it can have protocol driver children */
if (!(file = virJSONValueObjectGetObject(json, "file"))) { if (!(file = virJSONValueObjectGetObject(json, "file"))) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,

6
tests/virstoragetest.c
View File

@ -1600,7 +1600,11 @@ mymain(void)
"\"filename\": \"/tmp/testfle\"" "\"filename\": \"/tmp/testfle\""
"}" "}"
"}", "}",
"<source file='/tmp/testfle'/>\n", 0); "<source file='/tmp/testfle'>\n"
" <slices>\n"
" <slice type='storage' offset='10752' size='4063232'/>\n"
" </slices>\n"
"</source>\n", 0);
#endif /* WITH_YAJL */ #endif /* WITH_YAJL */