30.07.2020 17:15, Andrey Shinkevich wrote:
> Implementation of dumping QCOW2 image metadata.
> The sample output:
> {
> "Header_extensions": [
> {
> "name": "Feature table",
> "magic": 1745090647,
> "length": 192,
> "data_str": "<binary>"
> },
> {
> "name": "Bitmaps",
> "magic": 595929205,
> "length": 24,
> "data": {
> "nb_bitmaps": 2,
> "reserved32": 0,
> "bitmap_directory_size": 64,
> "bitmap_directory_offset": 1048576,
> "bitmap_directory": [
> {
> "name": "bitmap-1",
> "bitmap_table_offset": 589824,
> "bitmap_table_size": 1,
> "flags": 2,
> "type": 1,
> "granularity_bits": 15,
> "name_size": 8,
> "extra_data_size": 0,
> "bitmap_table": [
> {
> "type": "serialized",
> "offset": 655360
> },
> ...
>
> Suggested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
> ---
> tests/qemu-iotests/qcow2_format.py | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
> diff --git a/tests/qemu-iotests/qcow2_format.py b/tests/qemu-iotests/qcow2_format.py
> index a4114cb..7487720 100644
> --- a/tests/qemu-iotests/qcow2_format.py
> +++ b/tests/qemu-iotests/qcow2_format.py
> @@ -19,6 +19,15 @@
>
> import struct
> import string
> +import json
> +
> +
> +class ComplexEncoder(json.JSONEncoder):
> + def default(self, obj):
> + if hasattr(obj, 'to_dict'):
> + return obj.to_dict()
> + else:
> + return json.JSONEncoder.default(self, obj)
>
>
> class Qcow2Field:
> @@ -110,6 +119,10 @@ class Qcow2Struct(metaclass=Qcow2StructMeta):
> for i, field in enumerate(self.fields))
>
> def dump(self, is_json=False):
> + if is_json:
> + print(json.dumps(self.to_dict(), indent=4, cls=ComplexEncoder))
> + return
> +
> for f in self.fields:
> value = self.__dict__[f[2]]
> if isinstance(f[1], str):
> @@ -440,6 +453,10 @@ class QcowHeader(Qcow2Struct):
> fd.write(buf)
>
> def dump_extensions(self, is_json=False):
> + if is_json:
> + print(json.dumps(self.extensions, indent=4, cls=ComplexEncoder))
> + return
> +
> for ex in self.extensions:
> print('Header extension:')
> ex.dump()
>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
--
Best regards,
Vladimir