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 v13 10/11] qcow2_format.py: support dumping metadata in JSON format
Date: Thu, 6 Aug 2020 22:35:56 +0300 [thread overview]
Message-ID: <1596742557-320265-11-git-send-email-andrey.shinkevich@virtuozzo.com> (raw)
In-Reply-To: <1596742557-320265-1-git-send-email-andrey.shinkevich@virtuozzo.com>
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>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@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 5a298b2..8adc995 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_json'):
+ return obj.to_json()
+ 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_json(), indent=4, cls=ComplexEncoder))
+ return
+
for f in self.fields:
value = self.__dict__[f[2]]
if isinstance(f[1], str):
@@ -445,6 +458,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()
--
1.8.3.1
next prev parent reply other threads:[~2020-08-06 20:27 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-06 19:35 [PATCH v13 00/11] iotests: Dump QCOW2 dirty bitmaps metadata Andrey Shinkevich
2020-08-06 19:35 ` [PATCH v13 01/11] iotests: add test for QCOW2 header dump Andrey Shinkevich
2020-08-06 19:35 ` [PATCH v13 02/11] qcow2_format.py: make printable data an extension class member Andrey Shinkevich
2020-08-06 19:35 ` [PATCH v13 03/11] qcow2_format.py: change Qcow2BitmapExt initialization method Andrey Shinkevich
2020-08-06 19:35 ` [PATCH v13 04/11] qcow2_format.py: dump bitmap flags in human readable way Andrey Shinkevich
2020-08-06 19:35 ` [PATCH v13 05/11] qcow2_format.py: Dump bitmap directory information Andrey Shinkevich
2020-08-06 19:35 ` [PATCH v13 06/11] qcow2_format.py: pass cluster size to substructures Andrey Shinkevich
2020-08-06 19:35 ` [PATCH v13 07/11] qcow2_format.py: Dump bitmap table serialized entries Andrey Shinkevich
2020-08-06 19:35 ` [PATCH v13 08/11] qcow2.py: Introduce '-j' key to dump in JSON format Andrey Shinkevich
2020-08-06 19:35 ` [PATCH v13 09/11] qcow2_format.py: collect fields " Andrey Shinkevich
2020-08-07 6:30 ` Vladimir Sementsov-Ogievskiy
2020-08-07 8:03 ` Andrey Shinkevich
2020-08-07 8:09 ` Vladimir Sementsov-Ogievskiy
2020-08-06 19:35 ` Andrey Shinkevich [this message]
2020-08-06 19:35 ` [PATCH v13 11/11] iotests: dump QCOW2 header in JSON in #303 Andrey Shinkevich
2020-08-14 11:56 ` [PATCH v13 00/11] iotests: Dump QCOW2 dirty bitmaps metadata Andrey Shinkevich
2020-08-20 0:49 ` Eric Blake
2020-08-20 14:11 ` Andrey Shinkevich
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=1596742557-320265-11-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).