From nobody Wed Feb 11 02:07:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1696877081; cv=none; d=zohomail.com; s=zohoarc; b=BdrXvi1VYpj3Qfmgc+yEH2cjXcg5opnpMr9y7vwympvtup3CkO0C2ZCANLiKZKxMkVhzzuJmx1blQUJJr4lMe5tKNk9jjtp9UGCrGMqjTEqGSDGVB/O/sJ1fjWm7NkzTydwNuS4F8GLuwZfIJL3tjHchtcnAHanQg/4v3LXSiww= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696877081; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4LgUa6vFyc7ocW6ZF4d2p5x14/UNi9yWeqYmjBPM5wE=; b=Y8duvmjp1UWSB9wz7L7yXfbmqx4TkJwmCd5wN/chEWkQiydDt8mJmG+cE39QHd9cGbBawd7O4teF2ifcsQJNNpvIkEkU+k7XTIqKqjJ/BuTJn2GiHitGPc481H8DpygovcS+4V2/J59u4iTQFMlcdMuHgbvQ/OPaVgVJtFglhps= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169687708099217.72480520154204; Mon, 9 Oct 2023 11:44:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpvEC-0007dy-R1; Mon, 09 Oct 2023 14:43:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qpvEA-0007dI-Dy for qemu-devel@nongnu.org; Mon, 09 Oct 2023 14:43:38 -0400 Received: from smtp-out1.suse.de ([2001:67c:2178:6::1c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qpvE9-0000m1-0R for qemu-devel@nongnu.org; Mon, 09 Oct 2023 14:43:38 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id ECDCE21889; Mon, 9 Oct 2023 18:43:35 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id BEDB713586; Mon, 9 Oct 2023 18:43:33 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id wCilIdVJJGWFEgAAMHmgww (envelope-from ); Mon, 09 Oct 2023 18:43:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1696877015; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4LgUa6vFyc7ocW6ZF4d2p5x14/UNi9yWeqYmjBPM5wE=; b=Y7KM7qyStZe1ghc4iT+xKUfpvcVGlmye5wPaTLbOk68AQwlMZX+POC48fy2q1Nke0MH0fE HV/XB1R4aH4gdHhfGHyHxDkV5MxWo6CYrQ9S94a5ymtX51na3gw51G1P7X7gGElA+kzEwb VWUesn0XJpIr5Qmw/Y0faEMp6Wxanig= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1696877015; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4LgUa6vFyc7ocW6ZF4d2p5x14/UNi9yWeqYmjBPM5wE=; b=YsGb41ostYHzEcU7lWjeZ+GtzWThtnwZ0bJFZ1ylXswaL59ZIKJ+4ATzwucKh1/HyJVSBN dmTxHk4jAWb2G+DQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Juan Quintela , Peter Xu , Leonardo Bras , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Thomas Huth , John Snow , Cleber Rosa Subject: [PATCH v2 2/6] migration: Fix analyze-migration.py 'configuration' parsing Date: Mon, 9 Oct 2023 15:43:22 -0300 Message-Id: <20231009184326.15777-3-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231009184326.15777-1-farosas@suse.de> References: <20231009184326.15777-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2001:67c:2178:6::1c; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1696877082287100002 Content-Type: text/plain; charset="utf-8" The 'configuration' state subsections are currently not being parsed and the script fails when analyzing an aarch64 stream: Traceback (most recent call last): File "./scripts/analyze-migration.py", line 625, in dump.read(dump_memory =3D args.memory) File "./scripts/analyze-migration.py", line 571, in read raise Exception("Unknown section type: %d" % section_type) Exception: Unknown section type: 5 Signed-off-by: Fabiano Rosas Reviewed-by: Juan Quintela --- scripts/analyze-migration.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py index 082424558b..24687db497 100755 --- a/scripts/analyze-migration.py +++ b/scripts/analyze-migration.py @@ -261,12 +261,21 @@ def getDict(self): =20 =20 class ConfigurationSection(object): - def __init__(self, file): + def __init__(self, file, desc): self.file =3D file + self.desc =3D desc =20 def read(self): - name_len =3D self.file.read32() - name =3D self.file.readstr(len =3D name_len) + if self.desc: + version_id =3D self.desc['version'] + section =3D VMSDSection(self.file, version_id, self.desc, + 'configuration') + section.read() + else: + # backward compatibility for older streams that don't have + # the configuration section in the json + name_len =3D self.file.read32() + name =3D self.file.readstr(len =3D name_len) =20 class VMSDFieldGeneric(object): def __init__(self, desc, file): @@ -532,7 +541,8 @@ def read(self, desc_only =3D False, dump_memory =3D Fal= se, write_memory =3D False): if section_type =3D=3D self.QEMU_VM_EOF: break elif section_type =3D=3D self.QEMU_VM_CONFIGURATION: - section =3D ConfigurationSection(file) + config_desc =3D self.vmsd_desc.get('configuration') + section =3D ConfigurationSection(file, config_desc) section.read() elif section_type =3D=3D self.QEMU_VM_SECTION_START or section= _type =3D=3D self.QEMU_VM_SECTION_FULL: section_id =3D file.read32() --=20 2.35.3