OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qcow2_format.py: QcowHeaderExtension: add dump method 

Obviously, for-loop body in dump_extensions should be the dump method
of extension.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Message-Id: <20200606081806.23897-11-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2020-06-06 11:18:03 +03:00 committed by Eric Blake
parent 860543f055
commit 0931fcc7be
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/qemu-iotests/qcow2_format.py
View File

@ -108,6 +108,17 @@ class QcowHeaderExtension:
self.length = length
self.data = data
def dump(self):
data = self.data[:self.length]
if all(c in string.printable.encode('ascii') for c in data):
data = f"'{ data.decode('ascii') }'"
else:
data = '<binary>'
print(f'{"magic":<25} {self.magic:#x}')
print(f'{"length":<25} {self.length}')
print(f'{"data":<25} {data}')
@classmethod
def create(cls, magic, data):
return QcowHeaderExtension(magic, len(data), data)
@ -210,15 +221,6 @@ class QcowHeader(Qcow2Struct):
def dump_extensions(self):
for ex in self.extensions:
data = ex.data[:ex.length]
if all(c in string.printable.encode('ascii') for c in data):
data = f"'{ data.decode('ascii') }'"
else:
data = '<binary>'
print('Header extension:')
print(f'{"magic":<25} {ex.magic:#x}')
print(f'{"length":<25} {ex.length}')
print(f'{"data":<25} {data}')
ex.dump()
print()