From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, vsementsov@virtuozzo.com,
qemu-devel@nongnu.org, mreitz@redhat.com,
andrey.shinkevich@virtuozzo.com, den@openvz.org
Subject: [PATCH v7 3/9] qcow2_format.py: make printable data an extension class member
Date: Fri, 12 Jun 2020 03:04:56 +0300 [thread overview]
Message-ID: <1591920302-1002219-4-git-send-email-andrey.shinkevich@virtuozzo.com> (raw)
In-Reply-To: <1591920302-1002219-1-git-send-email-andrey.shinkevich@virtuozzo.com>
Let us differ binary data type from string one for the extension data
variable and keep the string as the QcowHeaderExtension class member.
Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
tests/qemu-iotests/qcow2_format.py | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/tests/qemu-iotests/qcow2_format.py b/tests/qemu-iotests/qcow2_format.py
index 0f65fd1..d4f0000 100644
--- a/tests/qemu-iotests/qcow2_format.py
+++ b/tests/qemu-iotests/qcow2_format.py
@@ -164,6 +164,13 @@ class QcowHeaderExtension(Qcow2Struct):
self.data = fd.read(padded)
assert self.data is not None
+ data_str = self.data[:self.length]
+ if all(c in string.printable.encode('ascii') for c in data_str):
+ data_str = f"'{ data_str.decode('ascii') }'"
+ else:
+ data_str = '<binary>'
+ self.data_str = data_str
+
if self.magic == QCOW2_EXT_MAGIC_BITMAPS:
self.obj = Qcow2BitmapExt(data=self.data)
else:
@@ -173,12 +180,7 @@ class QcowHeaderExtension(Qcow2Struct):
super().dump()
if self.obj is None:
- 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'{"data":<25} {data}')
+ print(f'{"data":<25} {self.data_str}')
else:
self.obj.dump()
--
1.8.3.1
next prev parent reply other threads:[~2020-06-12 0:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-12 0:04 [PATCH v7 0/9] iotests: Dump QCOW2 dirty bitmaps metadata Andrey Shinkevich
2020-06-12 0:04 ` [PATCH v7 1/9] iotests: Fix for magic hexadecimal output in 291 Andrey Shinkevich
2020-06-15 9:43 ` Vladimir Sementsov-Ogievskiy
2020-06-12 0:04 ` [PATCH v7 2/9] qcow2: Fix capitalization of header extension constant Andrey Shinkevich
2020-06-15 9:44 ` Vladimir Sementsov-Ogievskiy
2020-06-12 0:04 ` Andrey Shinkevich [this message]
2020-06-15 9:47 ` [PATCH v7 3/9] qcow2_format.py: make printable data an extension class member Vladimir Sementsov-Ogievskiy
2020-06-12 0:04 ` [PATCH v7 4/9] qcow2_format.py: Dump bitmap directory information Andrey Shinkevich
2020-06-15 10:34 ` Vladimir Sementsov-Ogievskiy
2020-06-12 0:04 ` [PATCH v7 5/9] qcow2_format.py: pass cluster size to substructures Andrey Shinkevich
2020-06-12 0:04 ` [PATCH v7 6/9] qcow2_format.py: Dump bitmap table serialized entries Andrey Shinkevich
2020-06-12 0:05 ` [PATCH v7 7/9] qcow2.py: Introduce '-j' key to dump in JSON format Andrey Shinkevich
2020-06-12 0:05 ` [PATCH v7 8/9] qcow2_format.py: collect fields " Andrey Shinkevich
2020-06-12 0:05 ` [PATCH v7 9/9] qcow2_format.py: support dumping metadata " Andrey Shinkevich
2020-06-15 9:42 ` [PATCH v7 0/9] iotests: Dump QCOW2 dirty bitmaps metadata Vladimir Sementsov-Ogievskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1591920302-1002219-4-git-send-email-andrey.shinkevich@virtuozzo.com \
--to=andrey.shinkevich@virtuozzo.com \
--cc=den@openvz.org \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).