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 v12 07/11] qcow2_format.py: Dump bitmap table serialized entries
Date: Thu, 30 Jul 2020 17:15:08 +0300 [thread overview]
Message-ID: <1596118512-424960-8-git-send-email-andrey.shinkevich@virtuozzo.com> (raw)
In-Reply-To: <1596118512-424960-1-git-send-email-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 65536 0
2 all-zeroes 65536 0
Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
---
tests/qemu-iotests/303.out | 4 ++++
tests/qemu-iotests/qcow2_format.py | 47 ++++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+)
diff --git a/tests/qemu-iotests/303.out b/tests/qemu-iotests/303.out
index dc3739b..d581fb4 100644
--- a/tests/qemu-iotests/303.out
+++ b/tests/qemu-iotests/303.out
@@ -70,6 +70,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
@@ -79,4 +81,6 @@ type 1
granularity_bits 16
name_size 8
extra_data_size 0
+Bitmap table type size offset
+0 all-zeroes 65536 0
diff --git a/tests/qemu-iotests/qcow2_format.py b/tests/qemu-iotests/qcow2_format.py
index ca0d350..1f033d4 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,49 @@ 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):
+ size = self.cluster_size
+ bitmap_table = enumerate(self.entries)
+ print(f'{"Bitmap table":<14} {"type":<15} {"size":<12} {"offset"}')
+ for i, entry in bitmap_table:
+ print(f'{i:<14} {entry.type:<15} {size:<12} {entry.offset}')
QCOW2_EXT_MAGIC_BITMAPS = 0x23852875
--
1.8.3.1
next prev parent reply other threads:[~2020-07-30 14:23 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 14:15 [PATCH v12 00/11] iotests: Dump QCOW2 dirty bitmaps metadata Andrey Shinkevich
2020-07-30 14:15 ` [PATCH v12 01/11] iotests: add test for QCOW2 header dump Andrey Shinkevich
2020-07-30 19:05 ` Eric Blake
2020-07-31 7:28 ` Andrey Shinkevich
2020-08-05 11:23 ` Vladimir Sementsov-Ogievskiy
2020-08-05 12:10 ` Andrey Shinkevich
2020-07-30 14:15 ` [PATCH v12 02/11] qcow2_format.py: make printable data an extension class member Andrey Shinkevich
2020-07-30 14:15 ` [PATCH v12 03/11] qcow2_format.py: change Qcow2BitmapExt initialization method Andrey Shinkevich
2020-07-30 14:15 ` [PATCH v12 04/11] qcow2_format.py: dump bitmap flags in human readable way Andrey Shinkevich
2020-07-30 14:15 ` [PATCH v12 05/11] qcow2_format.py: Dump bitmap directory information Andrey Shinkevich
2020-07-30 14:15 ` [PATCH v12 06/11] qcow2_format.py: pass cluster size to substructures Andrey Shinkevich
2020-07-30 14:15 ` Andrey Shinkevich [this message]
2020-08-05 15:57 ` [PATCH v12 07/11] qcow2_format.py: Dump bitmap table serialized entries Vladimir Sementsov-Ogievskiy
2020-07-30 14:15 ` [PATCH v12 08/11] qcow2.py: Introduce '-j' key to dump in JSON format Andrey Shinkevich
2020-08-05 16:12 ` Vladimir Sementsov-Ogievskiy
2020-07-30 14:15 ` [PATCH v12 09/11] qcow2_format.py: collect fields " Andrey Shinkevich
2020-08-05 16:58 ` Vladimir Sementsov-Ogievskiy
2020-08-06 9:08 ` Andrey Shinkevich
2020-08-06 9:18 ` Vladimir Sementsov-Ogievskiy
2020-07-30 14:15 ` [PATCH v12 10/11] qcow2_format.py: support dumping metadata " Andrey Shinkevich
2020-08-05 17:04 ` Vladimir Sementsov-Ogievskiy
2020-07-30 14:15 ` [PATCH v12 11/11] iotests: dump QCOW2 header in JSON in #303 Andrey Shinkevich
2020-08-05 17:08 ` 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=1596118512-424960-8-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).