[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 8/9] qcow2_format.py: collect fields to dump in JSON format
From: |
Andrey Shinkevich |
Subject: |
[PATCH v7 8/9] qcow2_format.py: collect fields to dump in JSON format |
Date: |
Fri, 12 Jun 2020 03:05:01 +0300 |
As __dict__ is being extended with class members we do not want to
print in JSON format dump, make a light copy of the initial __dict__
and extend the copy by adding lists we have to print in the JSON
output.
Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
---
tests/qemu-iotests/qcow2_format.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/qcow2_format.py
b/tests/qemu-iotests/qcow2_format.py
index a19f3b3..bdd5f68 100644
--- a/tests/qemu-iotests/qcow2_format.py
+++ b/tests/qemu-iotests/qcow2_format.py
@@ -92,6 +92,8 @@ class Qcow2Struct(metaclass=Qcow2StructMeta):
self.__dict__ = dict((field[2], values[i])
for i, field in enumerate(self.fields))
+ self.fields_dict = self.__dict__.copy()
+
def dump(self, dump_json=None):
for f in self.fields:
value = self.__dict__[f[2]]
@@ -102,7 +104,6 @@ class Qcow2Struct(metaclass=Qcow2StructMeta):
print('{:<25} {}'.format(f[2], value_str))
-
# seek relative to the current position in the file
FROM_CURRENT = 1
@@ -142,6 +143,7 @@ class Qcow2BitmapExt(Qcow2Struct):
def load(self, fd):
self.read_bitmap_directory(fd)
+ self.fields_dict.update(entries=self.bitmaps)
def dump(self, dump_json=None):
super().dump(dump_json)
@@ -189,6 +191,7 @@ class Qcow2BitmapDirEntry(Qcow2Struct):
table_size = self.bitmap_table_bytes * struct.calcsize('Q')
table = [e[0] for e in struct.iter_unpack('>Q', fd.read(table_size))]
self.bitmap_table = Qcow2BitmapTable(table)
+ self.fields_dict.update(bitmap_table=self.bitmap_table)
def dump_bitmap_dir_entry(self, dump_json=None):
print()
--
1.8.3.1
- [PATCH v7 0/9] iotests: Dump QCOW2 dirty bitmaps metadata, Andrey Shinkevich, 2020/06/11
- [PATCH v7 3/9] qcow2_format.py: make printable data an extension class member, Andrey Shinkevich, 2020/06/11
- [PATCH v7 4/9] qcow2_format.py: Dump bitmap directory information, Andrey Shinkevich, 2020/06/11
- [PATCH v7 1/9] iotests: Fix for magic hexadecimal output in 291, Andrey Shinkevich, 2020/06/11
- [PATCH v7 8/9] qcow2_format.py: collect fields to dump in JSON format,
Andrey Shinkevich <=
- [PATCH v7 2/9] qcow2: Fix capitalization of header extension constant., Andrey Shinkevich, 2020/06/11
- [PATCH v7 9/9] qcow2_format.py: support dumping metadata in JSON format, Andrey Shinkevich, 2020/06/11
- [PATCH v7 7/9] qcow2.py: Introduce '-j' key to dump in JSON format, Andrey Shinkevich, 2020/06/11
- [PATCH v7 5/9] qcow2_format.py: pass cluster size to substructures, Andrey Shinkevich, 2020/06/11
- [PATCH v7 6/9] qcow2_format.py: Dump bitmap table serialized entries, Andrey Shinkevich, 2020/06/11
- Re: [PATCH v7 0/9] iotests: Dump QCOW2 dirty bitmaps metadata, Vladimir Sementsov-Ogievskiy, 2020/06/15