[PATCH 15/15] virStorageSourceParseBackingJSONRaw: Parse 'offset' and 'size' attributes
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(a)redhat.com>
---
src/util/virstoragefile.c | 20 ++++++++++++++++++++
tests/virstoragetest.c | 6 +++++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 30d5a2fe67..802f3d59be 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -3540,8 +3540,28 @@ virStorageSourceParseBackingJSONRaw(virStorageSourcePtr src,
const char *jsonstr,
int opaque G_GNUC_UNUSED)
{
+ bool has_offset = virJSONValueObjectHasKey(json, "offset");
+ bool has_size = virJSONValueObjectHasKey(json, "size");
virJSONValuePtr file;
+ if (has_offset || has_size) {
+ src->sliceFormat = g_new0(virStorageSourceSlice, 1);
+
+ if (has_offset &&
+ virJSONValueObjectGetNumberUlong(json, "offset",
&src->sliceFormat->offset) < 0) {
+ virReportError(VIR_ERR_INVALID_ARG, "%s",
+ _("malformed 'offset' property of 'raw'
driver"));
+ return -1;
+ }
+
+ if (has_size &&
+ virJSONValueObjectGetNumberUlong(json, "size",
&src->sliceFormat->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 */
if (!(file = virJSONValueObjectGetObject(json, "file"))) {
virReportError(VIR_ERR_INVALID_ARG,
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index 25d41f0de4..8dda349b5c 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -1600,7 +1600,11 @@ mymain(void)
"\"filename\":
\"/tmp/testfle\""
"}"
"}",
- "<source file='/tmp/testfle'/>\n",
0);
+ "<source file='/tmp/testfle'>\n"
+ " <slices>\n"
+ " <slice type='format'
offset='10752' size='4063232'/>\n"
+ " </slices>\n"
+ "</source>\n", 0);
#endif /* WITH_YAJL */
--
2.24.1