From nobody Fri Dec 19 20:42:12 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=1591920551; cv=none; d=zohomail.com; s=zohoarc; b=iHLuLo05TXh/1NWw0KSyfuE+xcT7nF004nfCaK2VgEZ6t4w+eJRXurtQ9c1GCFqIyzONYnm8DfPJqHJ4q3SV6w+N0D1bxLo2pDSS+fL7fk7eASGE6COS5IbUBxAkk4IO8o0vfGmIgQMSylpcTmyrmn+qRW9b3IpqEuZlqqSbOc4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591920551; 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=l9IyQf0A/CdqzweWvxUJNZTpfRfdC9+ve3RuaAisIjY=; b=X+7geRHELwHCJq3QkuRqWo4RRsdatYSOB5KtLriLgefIpAZi+fOCEnk3htZbm5eJsFrCyZEnnGkyEdvYIGOc3lr4IQ6ZMUk2k7HCGuaqQayCIgDMq495bH+T+KHlICZGvIlMbayZUYHBIuF7Uqa8OrndiJnHgFese47Dv0/NND8= 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 1591920551031540.7070022194657; Thu, 11 Jun 2020 17:09:11 -0700 (PDT) Received: from localhost ([::1]:48044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjXFt-00078L-RO for importer@patchew.org; Thu, 11 Jun 2020 20:09:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjXC5-0008Qj-73; Thu, 11 Jun 2020 20:05:13 -0400 Received: from relay.sw.ru ([185.231.240.75]:52874 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-0006IG-Ln; 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-QV; Fri, 12 Jun 2020 03:04:59 +0300 From: Andrey Shinkevich To: qemu-block@nongnu.org Subject: [PATCH v7 9/9] qcow2_format.py: support dumping metadata in JSON format Date: Fri, 12 Jun 2020 03:05:02 +0300 Message-Id: <1591920302-1002219-10-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" Implementation of dumping QCOW2 image metadata. The sample output: { "Header_extensions": [ { "name": "Feature table", "magic": 1745090647, "length": 192, "data_str": "" }, { "name": "Bitmaps", "magic": 595929205, "length": 24, "data": { "nb_bitmaps": 2, "reserved32": 0, "bitmap_directory_size": 64, "bitmap_directory_offset": 1048576, "entries": [ { "name": "bitmap-1", "bitmap_table_offset": 589824, "bitmap_table_size": 1, "flags": [ "auto" ], "type": 1, "granularity_bits": 16, "name_size": 8, "extra_data_size": 0, "bitmap_table": { "table_entries": [ { "type": "serialized", "offset": 655360 }, ... Suggested-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Andrey Shinkevich --- tests/qemu-iotests/qcow2_format.py | 60 ++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 60 insertions(+) diff --git a/tests/qemu-iotests/qcow2_format.py b/tests/qemu-iotests/qcow2_= format.py index bdd5f68..35daec9 100644 --- a/tests/qemu-iotests/qcow2_format.py +++ b/tests/qemu-iotests/qcow2_format.py @@ -18,6 +18,15 @@ =20 import struct import string +import json + + +class ComplexEncoder(json.JSONEncoder): + def default(self, obj): + if hasattr(obj, 'get_fields_dict'): + return obj.get_fields_dict() + else: + return json.JSONEncoder.default(self, obj) =20 =20 class Qcow2Field: @@ -95,6 +104,11 @@ class Qcow2Struct(metaclass=3DQcow2StructMeta): self.fields_dict =3D self.__dict__.copy() =20 def dump(self, dump_json=3DNone): + if dump_json: + print(json.dumps(self.get_fields_dict(), indent=3D4, + cls=3DComplexEncoder)) + return + for f in self.fields: value =3D self.__dict__[f[2]] if isinstance(f[1], str): @@ -150,6 +164,9 @@ class Qcow2BitmapExt(Qcow2Struct): for bm in self.bitmaps: bm.dump_bitmap_dir_entry(dump_json) =20 + def get_fields_dict(self): + return self.fields_dict + =20 BME_FLAG_IN_USE =3D 1 << 0 BME_FLAG_AUTO =3D 1 << 1 @@ -202,6 +219,12 @@ class Qcow2BitmapDirEntry(Qcow2Struct): super().dump() self.bitmap_table.print_bitmap_table(self.cluster_size) =20 + def get_fields_dict(self): + bmp_name =3D dict(name=3Dself.name) + bme_dict =3D {**bmp_name, **self.fields_dict} + bme_dict['flags'] =3D self.bitmap_flags + return bme_dict + =20 class Qcow2BitmapTableEntry: =20 @@ -217,6 +240,9 @@ class Qcow2BitmapTableEntry: else: self.type =3D 'all-zeroes' =20 + def get_fields_dict(self): + return dict(type=3Dself.type, offset=3Dself.offset) + =20 class Qcow2BitmapTable: =20 @@ -232,6 +258,18 @@ class Qcow2BitmapTable: print(f'{i:<14} {entry.type:<15} {entry.offset:<24} {cluster_s= ize}') print("") =20 + def get_fields_dict(self): + return dict(table_entries=3Dself.entries) + + +class Qcow2HeaderExtensionsDoc: + + def __init__(self, extensions): + self.extensions =3D extensions + + def get_fields_dict(self): + return dict(Header_extensions=3Dself.extensions) + =20 QCOW2_EXT_MAGIC_BITMAPS =3D 0x23852875 =20 @@ -247,6 +285,9 @@ class QcowHeaderExtension(Qcow2Struct): 0x44415441: 'Data file' } =20 + def get_fields_dict(self): + return self.mapping.get(self.value, "") + fields =3D ( ('u32', Magic, 'magic'), ('u32', '{}', 'length') @@ -307,6 +348,16 @@ class QcowHeaderExtension(Qcow2Struct): else: self.obj.dump(dump_json) =20 + def get_fields_dict(self): + ext_name =3D dict(name=3Dself.Magic(self.magic)) + he_dict =3D {**ext_name, **self.fields_dict} + if self.obj is not None: + he_dict.update(data=3Dself.obj) + else: + he_dict.update(data_str=3Dself.data_str) + + return he_dict + @classmethod def create(cls, magic, data): return QcowHeaderExtension(magic, len(data), data) @@ -409,7 +460,16 @@ class QcowHeader(Qcow2Struct): fd.write(buf) =20 def dump_extensions(self, dump_json=3DNone): + if dump_json: + ext_doc =3D Qcow2HeaderExtensionsDoc(self.extensions) + print(json.dumps(ext_doc.get_fields_dict(), indent=3D4, + cls=3DComplexEncoder)) + return + for ex in self.extensions: print('Header extension:') ex.dump(dump_json) print() + + def get_fields_dict(self): + return self.fields_dict --=20 1.8.3.1