@@ -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()
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(-)