From nobody Fri Dec 19 16:04:32 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1591920687; cv=none; d=zohomail.com; s=zohoarc; b=llOAWqr/k4uy5kGYm4T4/O5iZZHs4S3p+ZqBOBseXyp612VAszh5oIlb7JxD/zEfNyklLoSAkh6sPkeF7fThK3Zyy3G4hL3V1IyPMs+YtYfy4viFdcB5bRZIdJtl82bK1yXmlcyMmxjKQE8vyMMk3c9y00+LcDoH6ljrdSOpDfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591920687; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Cj5KrORH2mow1Y3/twHQ+73XR+QKcVVdahTy9hEhJBs=; b=Kfo0A/YW4EHMJxPKC+fCYSWTKK6uAgt2UXgurmgS/hVCwI1haBMMroiPNiSqmo+lzsJLJKo381nnQ7upfHg59Ooh81RBSv074uVufZZeakhQIhpKvAkvjZQ6sEtQPucwONZR076RC+ruVUAA9D0yj1CJIlzSuNVpTcskpOxN5hs= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159192068785618.183802475832636; Thu, 11 Jun 2020 17:11:27 -0700 (PDT) Received: from localhost ([::1]:54448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjXI6-0002iE-Lt for importer@patchew.org; Thu, 11 Jun 2020 20:11:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjXC4-0008PM-JK; Thu, 11 Jun 2020 20:05:12 -0400 Received: from relay.sw.ru ([185.231.240.75]:52850 helo=relay3.sw.ru) by eggs.gnu.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjXBy-0006IC-Ou; Thu, 11 Jun 2020 20:05:12 -0400 Received: from [172.16.25.136] (helo=localhost.sw.ru) by relay3.sw.ru with esmtp (Exim 4.93) (envelope-from ) id 1jjXBr-0002Yd-N6; Fri, 12 Jun 2020 03:04:59 +0300 From: Andrey Shinkevich To: qemu-block@nongnu.org Subject: [PATCH v7 6/9] qcow2_format.py: Dump bitmap table serialized entries Date: Fri, 12 Jun 2020 03:04:59 +0300 Message-Id: <1591920302-1002219-7-git-send-email-andrey.shinkevich@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1591920302-1002219-1-git-send-email-andrey.shinkevich@virtuozzo.com> References: <1591920302-1002219-1-git-send-email-andrey.shinkevich@virtuozzo.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=185.231.240.75; envelope-from=andrey.shinkevich@virtuozzo.com; helo=relay3.sw.ru X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/11 20:05:03 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, andrey.shinkevich@virtuozzo.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add bitmap table information to the QCOW2 metadata dump. It extends the output of the test case #291 Bitmap name bitmap-1 ... Bitmap table type offset size 0 serialized 4718592 65536 1 serialized 4294967296 65536 2 serialized 5348033147437056 65536 3 serialized 13792273858822144 65536 4 serialized 4718592 65536 5 serialized 4294967296 65536 6 serialized 4503608217305088 65536 7 serialized 14073748835532800 65536 Signed-off-by: Andrey Shinkevich Reviewed-by: Eric Blake --- tests/qemu-iotests/291.out | 50 ++++++++++++++++++++++++++++++++++= ++++ tests/qemu-iotests/qcow2_format.py | 40 ++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/tests/qemu-iotests/291.out b/tests/qemu-iotests/291.out index d847419..595327c 100644 --- a/tests/qemu-iotests/291.out +++ b/tests/qemu-iotests/291.out @@ -42,6 +42,16 @@ type 1 granularity_bits 19 name_size 2 extra_data_size 0 +Bitmap table type offset size +0 serialized 5046272 65536 +1 all-zeroes 0 65536 +2 all-zeroes 0 65536 +3 all-zeroes 0 65536 +4 all-zeroes 0 65536 +5 all-zeroes 0 65536 +6 all-zeroes 0 65536 +7 all-zeroes 0 65536 + =20 Bitmap name b2 flag auto @@ -53,6 +63,16 @@ type 1 granularity_bits 16 name_size 2 extra_data_size 0 +Bitmap table type offset size +0 serialized 5177344 65536 +1 all-zeroes 0 65536 +2 all-zeroes 0 65536 +3 all-zeroes 0 65536 +4 all-zeroes 0 65536 +5 all-zeroes 0 65536 +6 all-zeroes 0 65536 +7 all-zeroes 0 65536 + =20 =20 =3D=3D=3D Bitmap preservation not possible to non-qcow2 =3D=3D=3D @@ -128,6 +148,16 @@ type 1 granularity_bits 19 name_size 2 extra_data_size 0 +Bitmap table type offset size +0 serialized 4587520 65536 +1 all-zeroes 0 65536 +2 all-zeroes 0 65536 +3 all-zeroes 0 65536 +4 all-zeroes 0 65536 +5 all-zeroes 0 65536 +6 all-zeroes 0 65536 +7 all-zeroes 0 65536 + =20 Bitmap name b2 flag auto @@ -139,6 +169,16 @@ type 1 granularity_bits 16 name_size 2 extra_data_size 0 +Bitmap table type offset size +0 serialized 4718592 65536 +1 serialized 4294967296 65536 +2 serialized 5348033147437056 65536 +3 serialized 13792273858822144 65536 +4 serialized 4718592 65536 +5 serialized 4294967296 65536 +6 serialized 4503608217305088 65536 +7 serialized 14073748835532800 65536 + =20 Bitmap name b0 table size 8 (bytes) @@ -149,6 +189,16 @@ type 1 granularity_bits 16 name_size 2 extra_data_size 0 +Bitmap table type offset size +0 serialized 5242880 65536 +1 all-zeroes 0 65536 +2 all-zeroes 0 65536 +3 all-zeroes 0 65536 +4 all-zeroes 0 65536 +5 all-zeroes 0 65536 +6 all-zeroes 0 65536 +7 all-zeroes 0 65536 + =20 =20 =3D=3D=3D Check bitmap contents =3D=3D=3D diff --git a/tests/qemu-iotests/qcow2_format.py b/tests/qemu-iotests/qcow2_= format.py index eb99119..c1c2773 100644 --- a/tests/qemu-iotests/qcow2_format.py +++ b/tests/qemu-iotests/qcow2_format.py @@ -137,6 +137,9 @@ class Qcow2BitmapExt(Qcow2Struct): shift =3D ((entry_raw_size + 7) & ~7) - entry_raw_size fd.seek(shift, FROM_CURRENT) =20 + for bm in self.bitmaps: + bm.read_bitmap_table(fd) + def load(self, fd): self.read_bitmap_directory(fd) =20 @@ -181,6 +184,12 @@ class Qcow2BitmapDirEntry(Qcow2Struct): return struct.calcsize(self.fmt) + self.name_size + \ self.extra_data_size =20 + def read_bitmap_table(self, fd): + fd.seek(self.bitmap_table_offset) + table_size =3D self.bitmap_table_bytes * struct.calcsize('Q') + table =3D [e[0] for e in struct.iter_unpack('>Q', fd.read(table_si= ze))] + self.bitmap_table =3D Qcow2BitmapTable(table) + def dump_bitmap_dir_entry(self): print() print(f'{"Bitmap name":<25} {self.name}') @@ -188,6 +197,37 @@ class Qcow2BitmapDirEntry(Qcow2Struct): print(f'{"flag":<25} {fl}') print(f'{"table size":<25} {self.bitmap_table_bytes} {"(bytes)"}') super().dump() + self.bitmap_table.print_bitmap_table(self.cluster_size) + + +class Qcow2BitmapTableEntry: + + BME_TABLE_ENTRY_OFFSET_MASK =3D 0x00fffffffffffe00 + BME_TABLE_ENTRY_FLAG_ALL_ONES =3D 1 + + def __init__(self, entry): + self.offset =3D entry & self.BME_TABLE_ENTRY_OFFSET_MASK + if self.offset: + self.type =3D 'serialized' + elif entry & self.BME_TABLE_ENTRY_FLAG_ALL_ONES: + self.type =3D 'all-ones' + else: + self.type =3D 'all-zeroes' + + +class Qcow2BitmapTable: + + def __init__(self, raw_table): + self.entries =3D [] + for entry in raw_table: + self.entries.append(Qcow2BitmapTableEntry(entry)) + + def print_bitmap_table(self, cluster_size): + bitmap_table =3D enumerate(self.entries) + print(f'{"Bitmap table":<14} {"type":<15} {"offset":<24} {"size"}') + for i, entry in bitmap_table: + print(f'{i:<14} {entry.type:<15} {entry.offset:<24} {cluster_s= ize}') + print("") =20 =20 QCOW2_EXT_MAGIC_BITMAPS =3D 0x23852875 --=20 1.8.3.1