From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
"open list:Block layer core" <qemu-block@nongnu.org>,
Max Reitz <mreitz@redhat.com>
Subject: [PULL 11/14] iotests: dump QCOW2 header in JSON in #303
Date: Fri, 21 Aug 2020 09:08:23 -0500 [thread overview]
Message-ID: <20200821140826.194322-12-eblake@redhat.com> (raw)
In-Reply-To: <20200821140826.194322-1-eblake@redhat.com>
From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Extend the test case #303 by dumping QCOW2 image metadata in JSON
format.
Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <1596742557-320265-12-git-send-email-andrey.shinkevich@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
tests/qemu-iotests/303 | 3 ++
tests/qemu-iotests/303.out | 76 ++++++++++++++++++++++++++++++++++++++
2 files changed, 79 insertions(+)
diff --git a/tests/qemu-iotests/303 b/tests/qemu-iotests/303
index e9accdc7bc92..6c2177448348 100755
--- a/tests/qemu-iotests/303
+++ b/tests/qemu-iotests/303
@@ -58,3 +58,6 @@ add_bitmap(1, 0, 6, False)
add_bitmap(2, 6, 8, True)
dump = ['qcow2.py', disk, 'dump-header']
subprocess.run(dump)
+# Dump the metadata in JSON format
+dump.append('-j')
+subprocess.run(dump)
diff --git a/tests/qemu-iotests/303.out b/tests/qemu-iotests/303.out
index 70828e05f11f..7fa1edef0d89 100644
--- a/tests/qemu-iotests/303.out
+++ b/tests/qemu-iotests/303.out
@@ -80,3 +80,79 @@ extra_data_size 0
Bitmap table type size offset
0 all-zeroes 0 0
+{
+ "magic": 1363560955,
+ "version": 3,
+ "backing_file_offset": 0,
+ "backing_file_size": 0,
+ "cluster_bits": 16,
+ "size": 10485760,
+ "crypt_method": 0,
+ "l1_size": 1,
+ "l1_table_offset": 196608,
+ "refcount_table_offset": 65536,
+ "refcount_table_clusters": 1,
+ "nb_snapshots": 0,
+ "snapshot_offset": 0,
+ "incompatible_features": 0,
+ "compatible_features": 0,
+ "autoclear_features": 1,
+ "refcount_order": 4,
+ "header_length": 112
+}
+
+[
+ {
+ "name": "Feature table",
+ "magic": 1745090647,
+ "length": 336,
+ "data_str": "<binary>"
+ },
+ {
+ "name": "Bitmaps",
+ "magic": 595929205,
+ "length": 24,
+ "data": {
+ "nb_bitmaps": 2,
+ "reserved32": 0,
+ "bitmap_directory_size": 64,
+ "bitmap_directory_offset": 10289152,
+ "bitmap_directory": [
+ {
+ "name": "bitmap-1",
+ "bitmap_table_offset": 10158080,
+ "bitmap_table_size": 1,
+ "flags": 2,
+ "type": 1,
+ "granularity_bits": 15,
+ "name_size": 8,
+ "extra_data_size": 0,
+ "bitmap_table": [
+ {
+ "type": "serialized",
+ "offset": 10092544,
+ "reserved": 0
+ }
+ ]
+ },
+ {
+ "name": "bitmap-2",
+ "bitmap_table_offset": 10223616,
+ "bitmap_table_size": 1,
+ "flags": 0,
+ "type": 1,
+ "granularity_bits": 16,
+ "name_size": 8,
+ "extra_data_size": 0,
+ "bitmap_table": [
+ {
+ "type": "all-zeroes",
+ "offset": 0,
+ "reserved": 0
+ }
+ ]
+ }
+ ]
+ }
+ }
+]
--
2.28.0
next prev parent reply other threads:[~2020-08-21 14:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-21 14:08 [PULL 00/14] bitmaps patches for 2020-08-21 Eric Blake
2020-08-21 14:08 ` [PULL 01/14] iotests: add test for QCOW2 header dump Eric Blake
2020-08-21 14:08 ` [PULL 02/14] qcow2_format.py: make printable data an extension class member Eric Blake
2020-08-21 14:08 ` [PULL 03/14] qcow2_format.py: change Qcow2BitmapExt initialization method Eric Blake
2020-08-21 14:08 ` [PULL 04/14] qcow2_format.py: dump bitmap flags in human readable way Eric Blake
2020-08-21 14:08 ` [PULL 05/14] qcow2_format.py: Dump bitmap directory information Eric Blake
2020-08-21 14:08 ` [PULL 06/14] qcow2_format.py: pass cluster size to substructures Eric Blake
2020-08-21 14:08 ` [PULL 07/14] qcow2_format.py: Dump bitmap table serialized entries Eric Blake
2020-08-21 14:08 ` [PULL 08/14] qcow2.py: Introduce '-j' key to dump in JSON format Eric Blake
2020-08-21 14:08 ` [PULL 09/14] qcow2_format.py: collect fields " Eric Blake
2020-08-21 14:08 ` [PULL 10/14] qcow2_format.py: support dumping metadata " Eric Blake
2020-08-21 14:08 ` Eric Blake [this message]
2020-08-21 14:08 ` [PULL 12/14] migration: Add block-bitmap-mapping parameter Eric Blake
2020-08-21 14:08 ` [PULL 13/14] iotests.py: Let wait_migration() return on failure Eric Blake
2020-08-21 14:08 ` [PULL 14/14] iotests: Test node/bitmap aliases during migration Eric Blake
2020-08-22 20:58 ` [PULL 00/14] bitmaps patches for 2020-08-21 Peter Maydell
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=20200821140826.194322-12-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=andrey.shinkevich@virtuozzo.com \
--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).