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 06/11] qcow2_format.py: pass cluster size to substructures
Date: Thu, 6 Aug 2020 22:35:52 +0300 [thread overview]
Message-ID: <1596742557-320265-7-git-send-email-andrey.shinkevich@virtuozzo.com> (raw)
In-Reply-To: <1596742557-320265-1-git-send-email-andrey.shinkevich@virtuozzo.com>
The cluster size of an image is the QcowHeader class member and may be
obtained by dependent extension structures such as Qcow2BitmapExt for
further bitmap table details print.
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, 11 insertions(+), 6 deletions(-)
diff --git a/tests/qemu-iotests/qcow2_format.py b/tests/qemu-iotests/qcow2_format.py
index 05a8aa9..ca0d350 100644
--- a/tests/qemu-iotests/qcow2_format.py
+++ b/tests/qemu-iotests/qcow2_format.py
@@ -129,19 +129,21 @@ class Qcow2BitmapExt(Qcow2Struct):
('u64', '{:#x}', 'bitmap_directory_offset')
)
- def __init__(self, fd):
+ def __init__(self, fd, cluster_size):
super().__init__(fd=fd)
tail = struct.calcsize(self.fmt) % 8
if tail:
fd.seek(8 - tail, 1)
position = fd.tell()
+ self.cluster_size = cluster_size
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)]
+ [Qcow2BitmapDirEntry(fd, cluster_size=self.cluster_size)
+ for _ in range(self.nb_bitmaps)]
def dump(self):
super().dump()
@@ -162,8 +164,9 @@ class Qcow2BitmapDirEntry(Qcow2Struct):
('u32', '{}', 'extra_data_size')
)
- def __init__(self, fd):
+ def __init__(self, fd, cluster_size):
super().__init__(fd=fd)
+ self.cluster_size = cluster_size
# Seek relative to the current position in the file
fd.seek(self.extra_data_size, 1)
bitmap_name = fd.read(self.name_size)
@@ -203,11 +206,13 @@ class QcowHeaderExtension(Qcow2Struct):
# then padding to next multiply of 8
)
- def __init__(self, magic=None, length=None, data=None, fd=None):
+ def __init__(self, magic=None, length=None, data=None, fd=None,
+ cluster_size=None):
"""
Support both loading from fd and creation from user data.
For fd-based creation current position in a file will be used to read
the data.
+ The cluster_size value may be obtained by dependent structures.
This should be somehow refactored and functionality should be moved to
superclass (to allow creation of any qcow2 struct), but then, fields
@@ -230,7 +235,7 @@ class QcowHeaderExtension(Qcow2Struct):
assert all(v is None for v in (magic, length, data))
super().__init__(fd=fd)
if self.magic == QCOW2_EXT_MAGIC_BITMAPS:
- self.obj = Qcow2BitmapExt(fd=fd)
+ self.obj = Qcow2BitmapExt(fd=fd, cluster_size=cluster_size)
self.data = None
else:
padded = (self.length + 7) & ~7
@@ -319,7 +324,7 @@ class QcowHeader(Qcow2Struct):
end = self.cluster_size
while fd.tell() < end:
- ext = QcowHeaderExtension(fd=fd)
+ ext = QcowHeaderExtension(fd=fd, cluster_size=self.cluster_size)
if ext.magic == 0:
break
else:
--
1.8.3.1
next prev parent reply other threads:[~2020-08-06 20:32 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 ` Andrey Shinkevich [this message]
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-7-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.