From nobody Fri Dec 19 20:35:53 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=1591920511; cv=none; d=zohomail.com; s=zohoarc; b=YCPkIzLDhDxsFQvo485JhpsCW56eZDhLlt7v70J3V+ngOs9eXSvXwUFqdCfkVtmYw48hiOPA2hMDABTwkoR/kh42OxAkb60boDkaPRcYtCl0yfykt4h5UT1sF/mLyR2DXLLlCI9oTefpu4h/IAbI36AlZ/SjR1LUQlaqfCgukxc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591920511; 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=JTdTQK4FoQp66X62qDXR0sOizfXvUlyfmx4u0cHioZw=; b=RhZfJNZOlSKo0XofuSQBsXOa/zeI2Ghr7dQ0pcmJBggI0Xdu38zQTA1RtuegPs5PDNtrkJxFTV6fnIaE9VhegPhDrqRDXQu+k62qmDDXji6hXjC1UIM8DyPGAymNuUEN2mBQiph8gytLBMb3K6GOKzYASKxeSesXkS5f642kqOU= 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 1591920511084465.5795882822914; Thu, 11 Jun 2020 17:08:31 -0700 (PDT) Received: from localhost ([::1]:45382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjXFF-0005sn-KA for importer@patchew.org; Thu, 11 Jun 2020 20:08:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56574) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjXC2-0008Le-3p; Thu, 11 Jun 2020 20:05:10 -0400 Received: from relay.sw.ru ([185.231.240.75]:52846 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-0006I8-IL; Thu, 11 Jun 2020 20:05:09 -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-PM; Fri, 12 Jun 2020 03:04:59 +0300 From: Andrey Shinkevich To: qemu-block@nongnu.org Subject: [PATCH v7 8/9] qcow2_format.py: collect fields to dump in JSON format Date: Fri, 12 Jun 2020 03:05:01 +0300 Message-Id: <1591920302-1002219-9-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" As __dict__ is being extended with class members we do not want to print in JSON format dump, make a light copy of the initial __dict__ and extend the copy by adding lists we have to print in the JSON output. Signed-off-by: Andrey Shinkevich --- tests/qemu-iotests/qcow2_format.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/qcow2_format.py b/tests/qemu-iotests/qcow2_= format.py index a19f3b3..bdd5f68 100644 --- a/tests/qemu-iotests/qcow2_format.py +++ b/tests/qemu-iotests/qcow2_format.py @@ -92,6 +92,8 @@ class Qcow2Struct(metaclass=3DQcow2StructMeta): self.__dict__ =3D dict((field[2], values[i]) for i, field in enumerate(self.fields)) =20 + self.fields_dict =3D self.__dict__.copy() + def dump(self, dump_json=3DNone): for f in self.fields: value =3D self.__dict__[f[2]] @@ -102,7 +104,6 @@ class Qcow2Struct(metaclass=3DQcow2StructMeta): =20 print('{:<25} {}'.format(f[2], value_str)) =20 - # seek relative to the current position in the file FROM_CURRENT =3D 1 =20 @@ -142,6 +143,7 @@ class Qcow2BitmapExt(Qcow2Struct): =20 def load(self, fd): self.read_bitmap_directory(fd) + self.fields_dict.update(entries=3Dself.bitmaps) =20 def dump(self, dump_json=3DNone): super().dump(dump_json) @@ -189,6 +191,7 @@ class Qcow2BitmapDirEntry(Qcow2Struct): 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) + self.fields_dict.update(bitmap_table=3Dself.bitmap_table) =20 def dump_bitmap_dir_entry(self, dump_json=3DNone): print() --=20 1.8.3.1