File offsets should use QAPI type 'size' (uint64_t). ImageCheck member @image-end-offset is 'int' (int64_t). collect_image_check() gets it from BdrvCheckResult member @image_end_offset (also int64_t, should never be negative).
Change the ImageCheck member to 'size', for QAPI/QMP consistency. Signed-off-by: Markus Armbruster <arm...@redhat.com> --- qapi/block-core.json | 2 +- qemu-img.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 51caee9..3c6d448 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -208,7 +208,7 @@ ## { 'struct': 'ImageCheck', 'data': {'filename': 'str', 'format': 'str', 'check-errors': 'int', - '*image-end-offset': 'int', '*corruptions': 'int', '*leaks': 'int', + '*image-end-offset': 'size', '*corruptions': 'int', '*leaks': 'int', '*corruptions-fixed': 'int', '*leaks-fixed': 'int', '*total-clusters': 'int', '*allocated-clusters': 'int', '*fragmented-clusters': 'int', '*compressed-clusters': 'int' } } diff --git a/qemu-img.c b/qemu-img.c index f4d5f0d..3ae5fe3 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -604,7 +604,7 @@ static void dump_human_image_check(ImageCheck *check, bool quiet) if (check->image_end_offset) { qprintf(quiet, - "Image end offset: %" PRId64 "\n", check->image_end_offset); + "Image end offset: %" PRIu64 "\n", check->image_end_offset); } } -- 2.7.5