From nobody Mon Feb 9 12:15:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600452486; cv=none; d=zohomail.com; s=zohoarc; b=ICRnrcwtz1GMW12BR0Vf+p3JZ2LzCt1oNtLbHB05KdDdKmKHCmPKJzA0qLSr1i5H+ns54jpSbqSzdlDdO5qHdQBoHqW4fai3aGFfS/4g35+PHPE8rnMeg2rW6PmJ8WynjsfnO++53+5worVbcgdzQCjkbazIJoT7kuWilT+2EE8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600452486; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=syFAbH20ps3bZJnXHQ5hKzOCwTqYrnEvIr2Q/VfgrK0=; b=RqPqZOuKEfEnmLAk302WCPTjjREEfPuElvq/ygUXRxUT5DdflF2CUytt194zSPUIdAlZOJleGp/FttibVJanojnbgQr56mixbOQU8nnNxV/E0Iqx6h4U6eCS1eO6u+LoxfC26cq2eRcVNaAsKYKpAkq5BrTisb+xTB/YL5M+vAg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 1600452486732944.6095232647084; Fri, 18 Sep 2020 11:08:06 -0700 (PDT) Received: from localhost ([::1]:38646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJKnl-0002aA-Ep for importer@patchew.org; Fri, 18 Sep 2020 14:08:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJKks-0000Lr-7w for qemu-devel@nongnu.org; Fri, 18 Sep 2020 14:05:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45264) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJKkq-0002nW-I5 for qemu-devel@nongnu.org; Fri, 18 Sep 2020 14:05:05 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-189-TrH9_ArSMo-vyNLMfzqZJQ-1; Fri, 18 Sep 2020 14:04:57 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 75A0B18BE163; Fri, 18 Sep 2020 18:04:56 +0000 (UTC) Received: from localhost (ovpn-119-217.rdu2.redhat.com [10.10.119.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1163E1002D58; Fri, 18 Sep 2020 18:04:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600452303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=syFAbH20ps3bZJnXHQ5hKzOCwTqYrnEvIr2Q/VfgrK0=; b=XqGq7HnVMyCNS6JD01soHIVLs6oDBwt+occP4ymTNlrycl2wfnZhHLUU1Eog+TSQmW+ToO sihz7lrey2SRPuw4OrgtZ0fFdhoypxfsqC8RonHE+Ex1gghLvjrpsgEwa6svyLo5Tuf5Ca gxbJrePbBKIDOmZWA+xZu4aol3m2Zr8= X-MC-Unique: TrH9_ArSMo-vyNLMfzqZJQ-1 From: Eduardo Habkost To: Cleber Rosa , Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 2/2] analyze-migration.py: fix read_migration_debug_json() return type Date: Fri, 18 Sep 2020 14:04:51 -0400 Message-Id: <20200918180451.1121055-3-ehabkost@redhat.com> In-Reply-To: <20200918180451.1121055-1-ehabkost@redhat.com> References: <20200918180451.1121055-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/18 01:32:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Alexey Kirillov , Vladimir Sementsov-Ogievskiy , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Alexey Kirillov Since we use result of read_migration_debug_json() as JSON formatted string, we must provide proper type. Before Python 3.6 json.loads() method support only str typed input. Signed-off-by: Alexey Kirillov Message-Id: <20200715152135.20287-1-lekiravi@yandex-team.ru> [ehabkost: added comment explaining why decode() is needed} Signed-off-by: Eduardo Habkost --- scripts/analyze-migration.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py index 95838cbff3..d70ec7d33a 100755 --- a/scripts/analyze-migration.py +++ b/scripts/analyze-migration.py @@ -97,7 +97,8 @@ class MigrationFile(object): # Seek back to where we were at the beginning self.file.seek(entrypos, 0) =20 - return data[jsonpos:jsonpos + jsonlen] + # explicit decode() needed for Python 3.5 compatibility + return data[jsonpos:jsonpos + jsonlen].decode("utf-8") =20 def close(self): self.file.close() --=20 2.26.2