[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 4/5] qemu-img: refactor dump_map_entry JSON format output
From: |
Eyal Moscovici |
Subject: |
[PATCH v2 4/5] qemu-img: refactor dump_map_entry JSON format output |
Date: |
Thu, 7 May 2020 00:34:58 +0300 |
Previously dump_map_entry identified whether we need to start a new JSON
array based on whether start address == 0. In this refactor we remove
this assumption as in following patches we will allow map to start from
an arbitrary position.
Reviewed-by: Eric Blake <address@hidden>
Acked-by: Mark Kanda <address@hidden>
Signed-off-by: Eyal Moscovici <address@hidden>
---
qemu-img.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index a1b507a0be..0a140fe564 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2896,9 +2896,8 @@ static int dump_map_entry(OutputFormat output_format,
MapEntry *e,
}
break;
case OFORMAT_JSON:
- printf("%s{ \"start\": %"PRId64", \"length\": %"PRId64","
+ printf("{ \"start\": %"PRId64", \"length\": %"PRId64","
" \"depth\": %"PRId64", \"zero\": %s, \"data\": %s",
- (e->start == 0 ? "[" : ",\n"),
e->start, e->length, e->depth,
e->zero ? "true" : "false",
e->data ? "true" : "false");
@@ -2907,8 +2906,8 @@ static int dump_map_entry(OutputFormat output_format,
MapEntry *e,
}
putchar('}');
- if (!next) {
- printf("]\n");
+ if (next) {
+ puts(",");
}
break;
}
@@ -3083,6 +3082,8 @@ static int img_map(int argc, char **argv)
if (output_format == OFORMAT_HUMAN) {
printf("%-16s%-16s%-16s%s\n", "Offset", "Length", "Mapped to", "File");
+ } else if (output_format == OFORMAT_JSON) {
+ putchar('[');
}
length = blk_getlength(blk);
@@ -3119,6 +3120,9 @@ static int img_map(int argc, char **argv)
}
ret = dump_map_entry(output_format, &curr, NULL);
+ if (output_format == OFORMAT_JSON) {
+ puts("]");
+ }
out:
blk_unref(blk);
--
2.17.2 (Apple Git-113)
- [PATCH v2 0/5] Additional parameters for qemu_img map, Eyal Moscovici, 2020/05/06
- [PATCH v2 2/5] qemu_img: add error report to cvtnum, Eyal Moscovici, 2020/05/06
- [PATCH v2 3/5] qemu-img: validate image length in img_map, Eyal Moscovici, 2020/05/06
- [PATCH v2 4/5] qemu-img: refactor dump_map_entry JSON format output,
Eyal Moscovici <=
- [PATCH v2 5/5] qemu-img: Add --start-offset and --max-length to map, Eyal Moscovici, 2020/05/06
- Re: [PATCH v2 0/5] Additional parameters for qemu_img map, Eric Blake, 2020/05/06