From nobody Sat May 4 19:34:28 2024 Delivered-To: importer@patchew.org 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; 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=1574849542; cv=none; d=zohomail.com; s=zohoarc; b=f/7xzqFMwCGv7CSPrmh1GobDOP8iP1AFPGHTiu9hzE7ixXlMpRC9ZVp4MmEoR+oAsX2OgbLuMunIz7lMXGACfSUbvvJg37OaMjlqVQnL+01GEdbSH+66E3BlVjAa/Yl6uzKCAxWST3K5BoG6gQNvm0EWoUJqAQK97zzRX3L6tWk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574849542; 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=S+3CrAnD3nCGAlbhEhjkPfsB9yw41Btd3/Hc6PMR26w=; b=S0K3PLst6qx8wbe8D+CI+XqnqTi/jzzoPACSU1GDPK0qPQJvIA0G206MRDxdNoS5t0ON2Se8V9/ONY20hpoiaRO8ko/PlvM/MMpoN1AqaiGDikTpL4LoeMw/8NIi7DZYlZAEyFNS37+zxovXB+29MRKnSr0JXhFtxTp4EzhlFFs= 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 1574849542442806.371651587589; Wed, 27 Nov 2019 02:12:22 -0800 (PST) Received: from localhost ([::1]:36554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZuJ3-00012g-Bd for importer@patchew.org; Wed, 27 Nov 2019 05:12:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60441) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZuHr-0008I6-Ge for qemu-devel@nongnu.org; Wed, 27 Nov 2019 05:11:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZuHq-00007j-Hv for qemu-devel@nongnu.org; Wed, 27 Nov 2019 05:11:07 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:59075 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iZuHq-00007A-EK for qemu-devel@nongnu.org; Wed, 27 Nov 2019 05:11:06 -0500 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-416-sLx1ubNtPb6qw_fqg3XrZA-1; Wed, 27 Nov 2019 05:11:01 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9AE92107ACE4 for ; Wed, 27 Nov 2019 10:11:00 +0000 (UTC) Received: from localhost (ovpn-112-17.ams2.redhat.com [10.36.112.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 640CC5C3F8; Wed, 27 Nov 2019 10:10:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574849465; 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=S+3CrAnD3nCGAlbhEhjkPfsB9yw41Btd3/Hc6PMR26w=; b=jChyk8lxbBoV+M7Qb3sXU80BTqISDwZmE5TRknly9WDLb+EbIROtLr38p3CPjaT2Ena/9X Mcan4I4jRQOBHTxsYzlXIK8OxOM/HY5tOljh82/CYZTSNjEktA99b+hHmOEaMfgmMss2Pj C5E1KvYsyFsbYtehFY1puWIRSyv5gGI= From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 1/2] analyze-migration.py: fix find() type error Date: Wed, 27 Nov 2019 14:10:37 +0400 Message-Id: <20191127101038.327080-2-marcandre.lureau@redhat.com> In-Reply-To: <20191127101038.327080-1-marcandre.lureau@redhat.com> References: <20191127101038.327080-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: sLx1ubNtPb6qw_fqg3XrZA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Eduardo Habkost , Cleber Rosa 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" Traceback (most recent call last): File "../scripts/analyze-migration.py", line 611, in dump.read(desc_only =3D True) File "../scripts/analyze-migration.py", line 513, in read self.load_vmsd_json(file) File "../scripts/analyze-migration.py", line 556, in load_vmsd_json vmsd_json =3D file.read_migration_debug_json() File "../scripts/analyze-migration.py", line 89, in read_migration_debug_= json nulpos =3D data.rfind("\0") TypeError: argument should be integer or bytes-like object, not 'str' Signed-off-by: Marc-Andr=C3=A9 Lureau --- scripts/analyze-migration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py index e527eb168e..2b835d9b70 100755 --- a/scripts/analyze-migration.py +++ b/scripts/analyze-migration.py @@ -86,8 +86,8 @@ class MigrationFile(object): =20 # Find the last NULL byte, then the first brace after that. This s= hould # be the beginning of our JSON data. - nulpos =3D data.rfind("\0") - jsonpos =3D data.find("{", nulpos) + nulpos =3D data.rfind(b'\0') + jsonpos =3D data.find(b'{', nulpos) =20 # Check backwards from there and see whether we guessed right self.file.seek(datapos + jsonpos - 5, 0) --=20 2.24.0 From nobody Sat May 4 19:34:28 2024 Delivered-To: importer@patchew.org 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; 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=1574849552; cv=none; d=zohomail.com; s=zohoarc; b=nPZ5a0G4Q+pskcF/8fQCaFVSu6rw0A0I7v0i8FbnPforsSszX3woxja3agZR9qbAc1M9bOfUzW3f5BzHxaxHmNszRL6P8RSuT4DbzyasbRjfmfpuz0Y9sgs80jv5qCLF9wmf6ehpyfu6VshaEtUO3+GYEKNr4r9CP7nWgyrvJKw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574849552; 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=UB2XnY70MSb2I8FZeFFjzSl2nlOMsaWbK6TzpJ3ZZ3s=; b=jKwqJDwq29YAnysAMYtellM/iab/Ot3ytiegJbi6oGhzGOQ3ki81xV4YRYAximbskw5fdxewu2RPArOxGq3mfnWkl+/V+IkI6/uZZgDVJTC9EsvSlzb86W5vywBTcXCE6jS+MLwfWgiXCDwlj0UCnTCWpjemTCumNEzYwpS0Usw= 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 1574849552395831.4721469980567; Wed, 27 Nov 2019 02:12:32 -0800 (PST) Received: from localhost ([::1]:36556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZuJD-0001Gs-5p for importer@patchew.org; Wed, 27 Nov 2019 05:12:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60475) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZuI1-0008RL-QF for qemu-devel@nongnu.org; Wed, 27 Nov 2019 05:11:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZuI0-0000Fa-DD for qemu-devel@nongnu.org; Wed, 27 Nov 2019 05:11:17 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:41325 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iZuI0-0000Eu-4Y for qemu-devel@nongnu.org; Wed, 27 Nov 2019 05:11:16 -0500 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-197--2tVxEqGPTGcSlgwoyJjuw-1; Wed, 27 Nov 2019 05:11:13 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9B3B591223 for ; Wed, 27 Nov 2019 10:11:12 +0000 (UTC) Received: from localhost (ovpn-112-17.ams2.redhat.com [10.36.112.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0BA4019C6A; Wed, 27 Nov 2019 10:11:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574849475; 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=UB2XnY70MSb2I8FZeFFjzSl2nlOMsaWbK6TzpJ3ZZ3s=; b=hD7IZGXsRRv0Vpo8eWOtMo8vTmJiAfNM8wB5oW3RfuFMa9zp3Yb124Jg7GfbxijmYt3qVS zzkrxlLFjNyXBA9K5M3LY2xg/D6LlVVmENRIpSSflrV28JGZILfa2Fh7jYaR68mgyk9x0R hqq09ujHYhvZoFkeUksqe86VG3KGv+o= From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 2/2] analyze-migration.py: replace numpy with python 3.2 Date: Wed, 27 Nov 2019 14:10:38 +0400 Message-Id: <20191127101038.327080-3-marcandre.lureau@redhat.com> In-Reply-To: <20191127101038.327080-1-marcandre.lureau@redhat.com> References: <20191127101038.327080-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: -2tVxEqGPTGcSlgwoyJjuw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Eduardo Habkost , Cleber Rosa 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" Use int.from_bytes() from python 3.2 instead. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Eduardo Habkost --- scripts/analyze-migration.py | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py index 2b835d9b70..96a31d3974 100755 --- a/scripts/analyze-migration.py +++ b/scripts/analyze-migration.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Migration Stream Analyzer # @@ -17,12 +17,18 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, see . =20 -from __future__ import print_function -import numpy as np import json import os import argparse import collections +import struct +import sys + + +MIN_PYTHON =3D (3, 2) +if sys.version_info < MIN_PYTHON: + sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON) + =20 def mkdir_p(path): try: @@ -30,29 +36,26 @@ def mkdir_p(path): except OSError: pass =20 + class MigrationFile(object): def __init__(self, filename): self.filename =3D filename self.file =3D open(self.filename, "rb") =20 def read64(self): - return np.asscalar(np.fromfile(self.file, count=3D1, dtype=3D'>i8'= )[0]) + return int.from_bytes(self.file.read(8), byteorder=3D'big', signed= =3DTrue) =20 def read32(self): - return np.asscalar(np.fromfile(self.file, count=3D1, dtype=3D'>i4'= )[0]) + return int.from_bytes(self.file.read(4), byteorder=3D'big', signed= =3DTrue) =20 def read16(self): - return np.asscalar(np.fromfile(self.file, count=3D1, dtype=3D'>i2'= )[0]) + return int.from_bytes(self.file.read(2), byteorder=3D'big', signed= =3DTrue) =20 def read8(self): - return np.asscalar(np.fromfile(self.file, count=3D1, dtype=3D'>i1'= )[0]) + return int.from_bytes(self.file.read(1), byteorder=3D'big', signed= =3DTrue) =20 def readstr(self, len =3D None): - if len is None: - len =3D self.read8() - if len =3D=3D 0: - return "" - return np.fromfile(self.file, count=3D1, dtype=3D('S%d' % len))[0] + return self.readvar(len).decode('utf-8') =20 def readvar(self, size =3D None): if size is None: @@ -275,7 +278,7 @@ class VMSDFieldGeneric(object): return str(self.__str__()) =20 def __str__(self): - return " ".join("{0:02x}".format(ord(c)) for c in self.data) + return " ".join("{0:02x}".format(c) for c in self.data) =20 def getDict(self): return self.__str__() @@ -307,8 +310,8 @@ class VMSDFieldInt(VMSDFieldGeneric): =20 def read(self): super(VMSDFieldInt, self).read() - self.sdata =3D np.fromstring(self.data, count=3D1, dtype=3D(self.s= dtype))[0] - self.udata =3D np.fromstring(self.data, count=3D1, dtype=3D(self.u= dtype))[0] + self.sdata =3D int.from_bytes(self.data, byteorder=3D'big', signed= =3DTrue) + self.udata =3D int.from_bytes(self.data, byteorder=3D'big', signed= =3DFalse) self.data =3D self.sdata return self.data =20 @@ -363,7 +366,7 @@ class VMSDFieldStruct(VMSDFieldGeneric): array_len =3D field.pop('array_len') field['index'] =3D 0 new_fields.append(field) - for i in xrange(1, array_len): + for i in range(1, array_len): c =3D field.copy() c['index'] =3D i new_fields.append(c) --=20 2.24.0