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 05/11] qcow2_format.py: Dump bitmap directory information
Date: Thu, 6 Aug 2020 22:35:51 +0300 [thread overview]
Message-ID: <1596742557-320265-6-git-send-email-andrey.shinkevich@virtuozzo.com> (raw)
In-Reply-To: <1596742557-320265-1-git-send-email-andrey.shinkevich@virtuozzo.com>
Read and dump entries from the bitmap directory of QCOW2 image.
Header extension:
magic 0x23852875 (Bitmaps)
...
Bitmap name bitmap-1
bitmap_table_offset 0xf0000
bitmap_table_size 1
flags 0x2 (['auto'])
type 1
granularity_bits 16
name_size 8
extra_data_size 0
Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
tests/qemu-iotests/303.out | 18 +++++++++++++++
tests/qemu-iotests/qcow2_format.py | 47 ++++++++++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+)
diff --git a/tests/qemu-iotests/303.out b/tests/qemu-iotests/303.out
index 8d7973c..038ba93 100644
--- a/tests/qemu-iotests/303.out
+++ b/tests/qemu-iotests/303.out
@@ -58,3 +58,21 @@ reserved32 0
bitmap_directory_size 0x40
bitmap_directory_offset 0x9d0000
+Bitmap name bitmap-1
+bitmap_table_offset 0x9b0000
+bitmap_table_size 1
+flags 0x2 (['auto'])
+type 1
+granularity_bits 15
+name_size 8
+extra_data_size 0
+
+Bitmap name bitmap-2
+bitmap_table_offset 0x9c0000
+bitmap_table_size 1
+flags 0x0 ([])
+type 1
+granularity_bits 16
+name_size 8
+extra_data_size 0
+
diff --git a/tests/qemu-iotests/qcow2_format.py b/tests/qemu-iotests/qcow2_format.py
index b447344..05a8aa9 100644
--- a/tests/qemu-iotests/qcow2_format.py
+++ b/tests/qemu-iotests/qcow2_format.py
@@ -134,6 +134,53 @@ class Qcow2BitmapExt(Qcow2Struct):
tail = struct.calcsize(self.fmt) % 8
if tail:
fd.seek(8 - tail, 1)
+ position = fd.tell()
+ self.read_bitmap_directory(fd)
+ fd.seek(position)
+
+ def read_bitmap_directory(self, fd):
+ fd.seek(self.bitmap_directory_offset)
+ self.bitmap_directory = \
+ [Qcow2BitmapDirEntry(fd) for _ in range(self.nb_bitmaps)]
+
+ def dump(self):
+ super().dump()
+ for entry in self.bitmap_directory:
+ print()
+ entry.dump()
+
+
+class Qcow2BitmapDirEntry(Qcow2Struct):
+
+ fields = (
+ ('u64', '{:#x}', 'bitmap_table_offset'),
+ ('u32', '{}', 'bitmap_table_size'),
+ ('u32', BitmapFlags, 'flags'),
+ ('u8', '{}', 'type'),
+ ('u8', '{}', 'granularity_bits'),
+ ('u16', '{}', 'name_size'),
+ ('u32', '{}', 'extra_data_size')
+ )
+
+ def __init__(self, fd):
+ super().__init__(fd=fd)
+ # Seek relative to the current position in the file
+ fd.seek(self.extra_data_size, 1)
+ bitmap_name = fd.read(self.name_size)
+ self.name = bitmap_name.decode('ascii')
+ # Move position to the end of the entry in the directory
+ entry_raw_size = self.bitmap_dir_entry_raw_size()
+ padding = ((entry_raw_size + 7) & ~7) - entry_raw_size
+ fd.seek(padding, 1)
+
+ def bitmap_dir_entry_raw_size(self):
+ return struct.calcsize(self.fmt) + self.name_size + \
+ self.extra_data_size
+
+ def dump(self):
+ print(f'{"Bitmap name":<25} {self.name}')
+ super(Qcow2BitmapDirEntry, self).dump()
+
QCOW2_EXT_MAGIC_BITMAPS = 0x23852875
--
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 ` Andrey Shinkevich [this message]
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 ` [PATCH v13 10/11] qcow2_format.py: support dumping metadata " Andrey Shinkevich
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-6-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).