From nobody Mon Feb 9 08:57:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.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=1558356933; cv=none; d=zoho.com; s=zohoarc; b=VngY/nd2itlabKWmiamHtf+9oIcF+7S5WHRVNdFvczsKnZ8vfn+Drlwn8zbIB/N6iV4uAyzN67QYyWrRFWPgx48+QpkV8Rh1X6Ufp4y85gCO0/IhU+UPUk74XnteuJgag9JHamM8xjOKIY4OXGXxq0Vfk0Ld4qps7PV8if3rfPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558356933; 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:ARC-Authentication-Results; bh=p2jBNrqUdmWD3e30ry/0Jz3yp3etjec+tHwqA27Ifec=; b=OVV0iLKYv9Q8Wq7XD6NB5Hw1rVTGmE3YUZxiOLdCLC8mZsgO/1berXLIqSsVJq+I5x39TQcTERPW9aSO3EZFyO29g6nxEJKhlDPPIcFgVazcQAPOSRNx8+7ZA7DTPZ9Rtc/cen6awD+Sdh6Yx+xkgSDdzlJJ+3QZUl9v3sb4DD0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558356933409211.21010961116406; Mon, 20 May 2019 05:55:33 -0700 (PDT) Received: from localhost ([127.0.0.1]:35131 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hShp7-0007pD-AC for importer@patchew.org; Mon, 20 May 2019 08:55:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hShhi-0002Tv-1v for qemu-devel@nongnu.org; Mon, 20 May 2019 08:47:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hShhg-0006CI-09 for qemu-devel@nongnu.org; Mon, 20 May 2019 08:47:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55960) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hShhd-0005w2-V2 for qemu-devel@nongnu.org; Mon, 20 May 2019 08:47:42 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 9748C307D860; Mon, 20 May 2019 12:47:25 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-74.ams2.redhat.com [10.36.117.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A25E5129E; Mon, 20 May 2019 12:47:18 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 02EDA11AB8; Mon, 20 May 2019 14:47:17 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 20 May 2019 14:47:04 +0200 Message-Id: <20190520124716.30472-3-kraxel@redhat.com> In-Reply-To: <20190520124716.30472-1-kraxel@redhat.com> References: <20190520124716.30472-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Mon, 20 May 2019 12:47:25 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 02/14] tests/vm: python3 fixes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Ed Maste , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kamil Rytarowski , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Li-Wen Hsu , Brad Smith 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" Add proper unicode handling when processing strings. Also need to explicitly say we want int not float. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/vm/basevm.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 0556bdcf9e9f..3126fb10a819 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -73,7 +73,7 @@ class BaseVM(object): "-vnc", "127.0.0.1:0,to=3D20", "-serial", "file:%s" % os.path.join(self._tmpdir, "serial.out"= )] if vcpus and vcpus > 1: - self._args +=3D ["-smp", str(vcpus)] + self._args +=3D ["-smp", "%d" % vcpus] if kvm_available(self.arch): self._args +=3D ["-enable-kvm"] else: @@ -85,12 +85,12 @@ class BaseVM(object): if not sha256sum: return True checksum =3D subprocess.check_output(["sha256sum", fname]).spl= it()[0] - return sha256sum =3D=3D checksum + return sha256sum =3D=3D checksum.decode("utf-8") =20 cache_dir =3D os.path.expanduser("~/.cache/qemu-vm/download") if not os.path.exists(cache_dir): os.makedirs(cache_dir) - fname =3D os.path.join(cache_dir, hashlib.sha1(url).hexdigest()) + fname =3D os.path.join(cache_dir, hashlib.sha1(url.encode("utf-8")= ).hexdigest()) if os.path.exists(fname) and check_sha256sum(fname): return fname logging.debug("Downloading %s to %s...", url, fname) @@ -134,7 +134,7 @@ class BaseVM(object): raise NotImplementedError =20 def add_source_dir(self, src_dir): - name =3D "data-" + hashlib.sha1(src_dir).hexdigest()[:5] + name =3D "data-" + hashlib.sha1(src_dir.encode("utf-8")).hexdigest= ()[:5] tarfile =3D os.path.join(self._tmpdir, name + ".tar") logging.debug("Creating archive %s for src_dir dir: %s", tarfile, = src_dir) subprocess.check_call(["./scripts/archive-source.sh", tarfile], @@ -256,7 +256,7 @@ def main(vmcls): vm.add_source_dir(args.build_qemu) cmd =3D [vm.BUILD_SCRIPT.format( configure_opts =3D " ".join(argv), - jobs=3Dargs.jobs, + jobs=3Dint(args.jobs), target=3Dargs.build_target, verbose =3D "V=3D1" if args.verbose else "")] else: --=20 2.18.1