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 07/14] qcow2_format.py: Dump bitmap table serialized entries
Date: Fri, 21 Aug 2020 09:08:19 -0500 [thread overview]
Message-ID: <20200821140826.194322-8-eblake@redhat.com> (raw)
In-Reply-To: <20200821140826.194322-1-eblake@redhat.com>
From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Add bitmap table information to the QCOW2 metadata dump.
Bitmap name bitmap-1
...
Bitmap table type size offset
0 serialized 65536 10092544
1 all-zeroes 0 0
2 all-zeroes 0 0
Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <1596742557-320265-8-git-send-email-andrey.shinkevich@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
tests/qemu-iotests/303.out | 4 +++
tests/qemu-iotests/qcow2_format.py | 50 ++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+)
diff --git a/tests/qemu-iotests/303.out b/tests/qemu-iotests/303.out
index 038ba93a87d7..70828e05f11f 100644
--- a/tests/qemu-iotests/303.out
+++ b/tests/qemu-iotests/303.out
@@ -66,6 +66,8 @@ type 1
granularity_bits 15
name_size 8
extra_data_size 0
+Bitmap table type size offset
+0 serialized 65536 10092544
Bitmap name bitmap-2
bitmap_table_offset 0x9c0000
@@ -75,4 +77,6 @@ type 1
granularity_bits 16
name_size 8
extra_data_size 0
+Bitmap table type size offset
+0 all-zeroes 0 0
diff --git a/tests/qemu-iotests/qcow2_format.py b/tests/qemu-iotests/qcow2_format.py
index ca0d3501e0a2..574249bc463c 100644
--- a/tests/qemu-iotests/qcow2_format.py
+++ b/tests/qemu-iotests/qcow2_format.py
@@ -175,6 +175,10 @@ class Qcow2BitmapDirEntry(Qcow2Struct):
entry_raw_size = self.bitmap_dir_entry_raw_size()
padding = ((entry_raw_size + 7) & ~7) - entry_raw_size
fd.seek(padding, 1)
+ self.bitmap_table = Qcow2BitmapTable(fd=fd,
+ offset=self.bitmap_table_offset,
+ nb_entries=self.bitmap_table_size,
+ cluster_size=self.cluster_size)
def bitmap_dir_entry_raw_size(self):
return struct.calcsize(self.fmt) + self.name_size + \
@@ -183,6 +187,52 @@ class Qcow2BitmapDirEntry(Qcow2Struct):
def dump(self):
print(f'{"Bitmap name":<25} {self.name}')
super(Qcow2BitmapDirEntry, self).dump()
+ self.bitmap_table.dump()
+
+
+class Qcow2BitmapTableEntry(Qcow2Struct):
+
+ fields = (
+ ('u64', '{}', 'entry'),
+ )
+
+ BME_TABLE_ENTRY_RESERVED_MASK = 0xff000000000001fe
+ BME_TABLE_ENTRY_OFFSET_MASK = 0x00fffffffffffe00
+ BME_TABLE_ENTRY_FLAG_ALL_ONES = 1
+
+ def __init__(self, fd):
+ super().__init__(fd=fd)
+ self.reserved = self.entry & self.BME_TABLE_ENTRY_RESERVED_MASK
+ self.offset = self.entry & self.BME_TABLE_ENTRY_OFFSET_MASK
+ if self.offset:
+ if self.entry & self.BME_TABLE_ENTRY_FLAG_ALL_ONES:
+ self.type = 'invalid'
+ else:
+ self.type = 'serialized'
+ elif self.entry & self.BME_TABLE_ENTRY_FLAG_ALL_ONES:
+ self.type = 'all-ones'
+ else:
+ self.type = 'all-zeroes'
+
+
+class Qcow2BitmapTable:
+
+ def __init__(self, fd, offset, nb_entries, cluster_size):
+ self.cluster_size = cluster_size
+ position = fd.tell()
+ fd.seek(offset)
+ self.entries = [Qcow2BitmapTableEntry(fd) for _ in range(nb_entries)]
+ fd.seek(position)
+
+ def dump(self):
+ bitmap_table = enumerate(self.entries)
+ print(f'{"Bitmap table":<14} {"type":<15} {"size":<12} {"offset"}')
+ for i, entry in bitmap_table:
+ if entry.type == 'serialized':
+ size = self.cluster_size
+ else:
+ size = 0
+ print(f'{i:<14} {entry.type:<15} {size:<12} {entry.offset}')
QCOW2_EXT_MAGIC_BITMAPS = 0x23852875
--
2.28.0
next prev parent reply other threads:[~2020-08-21 14:10 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 ` Eric Blake [this message]
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 ` [PULL 11/14] iotests: dump QCOW2 header in JSON in #303 Eric Blake
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-8-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).