From nobody Tue Feb 10 11:56:02 2026 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=1594973915; cv=none; d=zohomail.com; s=zohoarc; b=AzvZnntq9laCyL4IPhSBF/TeKaXx+gZAJxcuEK52qmzM05bvIo5/N1xUnsrpWh3qImSiWTs9MLQY6971Nv+I/UQvOIJejHo0VPlZVTMpIJBiPDUW3D1b90G3x92sYZm3z/C6oLzsPVqt/XD74IMqa8LY8Wz1w/RU90m8YHcQJw8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594973915; 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=xxBJBUS0nOyOUigQ98FEcLzrwzXOvg1tHns1S5mVULY=; b=VE/4NFaWHdDIlTpyvzRF/Ur29/x6L6dU4Y4EJTprrWEG/7LUGL56kWboXGZkCFGKpKR2dcrBDmxe6Lbw7boiF8ZjTK7PeTvgTdA+0GuQ3cph9GbYo4K09h8KVyhrxHHDfkLMer2G5TpEA1x6FKmyVpuTgG2HbIbn3ZevKb5pAQU= 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 1594973915202431.03218724325484; Fri, 17 Jul 2020 01:18:35 -0700 (PDT) Received: from localhost ([::1]:50972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwLZh-0007PP-VM for importer@patchew.org; Fri, 17 Jul 2020 04:18:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jwLWO-0001qt-02; Fri, 17 Jul 2020 04:15:09 -0400 Received: from relay.sw.ru ([185.231.240.75]:49998 helo=relay3.sw.ru) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jwLWK-0007JR-DW; Fri, 17 Jul 2020 04:15:07 -0400 Received: from [172.16.25.136] (helo=localhost.sw.ru) by relay3.sw.ru with esmtp (Exim 4.93) (envelope-from ) id 1jwLWC-0003cP-QU; Fri, 17 Jul 2020 11:14:56 +0300 From: Andrey Shinkevich To: qemu-block@nongnu.org Subject: [PATCH v11 09/11] qcow2_format.py: collect fields to dump in JSON format Date: Fri, 17 Jul 2020 11:14:57 +0300 Message-Id: <1594973699-781898-10-git-send-email-andrey.shinkevich@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1594973699-781898-1-git-send-email-andrey.shinkevich@virtuozzo.com> References: <1594973699-781898-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/07/17 04:15:01 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=ham autolearn_force=no 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" As __dict__ is being extended with class members we do not want to print, add the to_dict() method to classes that returns a dictionary with desired fields and their values. Extend it in subclass when necessary to print the final dictionary in the JSON output which follows. Suggested-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Andrey Shinkevich --- tests/qemu-iotests/qcow2_format.py | 38 ++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 38 insertions(+) diff --git a/tests/qemu-iotests/qcow2_format.py b/tests/qemu-iotests/qcow2_= format.py index 2921a27..19d29b8 100644 --- a/tests/qemu-iotests/qcow2_format.py +++ b/tests/qemu-iotests/qcow2_format.py @@ -119,6 +119,9 @@ class Qcow2Struct(metaclass=3DQcow2StructMeta): =20 print('{:<25} {}'.format(f[2], value_str)) =20 + def to_dict(self): + return dict((f[2], self.__dict__[f[2]]) for f in self.fields) + =20 class Qcow2BitmapExt(Qcow2Struct): =20 @@ -152,6 +155,11 @@ class Qcow2BitmapExt(Qcow2Struct): print() entry.dump() =20 + def to_dict(self): + fields_dict =3D super().to_dict() + fields_dict.update(bitmap_directory=3Dself.bitmap_directory) + return fields_dict + =20 class Qcow2BitmapDirEntry(Qcow2Struct): =20 @@ -190,6 +198,13 @@ class Qcow2BitmapDirEntry(Qcow2Struct): super(Qcow2BitmapDirEntry, self).dump() self.bitmap_table.dump() =20 + def to_dict(self): + fields_dict =3D super().to_dict() + fields_dict.update(bitmap_table=3Dself.bitmap_table) + bmp_name =3D dict(name=3Dself.name) + bme_dict =3D {**bmp_name, **fields_dict} + return bme_dict + =20 class Qcow2BitmapTableEntry: =20 @@ -205,6 +220,9 @@ class Qcow2BitmapTableEntry: else: self.type =3D 'all-zeroes' =20 + def to_dict(self): + return dict(type=3Dself.type, offset=3Dself.offset) + =20 class Qcow2BitmapTable: =20 @@ -226,6 +244,9 @@ class Qcow2BitmapTable: for i, entry in bitmap_table: print(f'{i:<14} {entry.type:<15} {entry.offset:<24} {size}') =20 + def to_dict(self): + return dict(entries=3Dself.entries) + =20 QCOW2_EXT_MAGIC_BITMAPS =3D 0x23852875 =20 @@ -241,6 +262,9 @@ class QcowHeaderExtension(Qcow2Struct): 0x44415441: 'Data file' } =20 + def to_dict(self): + return self.mapping.get(self.value, "") + fields =3D ( ('u32', Magic, 'magic'), ('u32', '{}', 'length') @@ -303,6 +327,17 @@ class QcowHeaderExtension(Qcow2Struct): else: self.obj.dump() =20 + def to_dict(self): + fields_dict =3D super().to_dict() + ext_name =3D dict(name=3Dself.Magic(self.magic)) + he_dict =3D {**ext_name, **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) @@ -405,3 +440,6 @@ class QcowHeader(Qcow2Struct): print('Header extension:') ex.dump() print() + + def to_dict(self): + return super().to_dict() --=20 1.8.3.1