From nobody Sun May 5 22:30:24 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=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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578399356; cv=none; d=zohomail.com; s=zohoarc; b=Yh+cBUlNhtqGAnBrhTNAVVseypyQqemcn5evi/7y6hnOuxD5TqqMEMmQOMWco4uV5HUQXL2ifzOEKSoapTfiA0Tqpw6dmgSHLoE//uQbA0kHluyyyzsuAYbedakMi1hy7jAjlUTqZnLnIJ+MgYBgoGQpJOyCqxsYKR3rvlZscdA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578399356; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=LZaehhwnm5cEFqqWuj5gsjbWKlzGOEjtaCN2sNyD9Tg=; b=lzdCinASQSD5nyZMrYWIOPrZDNesOFbEV+pK4K7MNPSDrw58SOwD/LD4H4z2ecXlo62a610qVZQtIM44BMxQX/oemZvqbseo3FCXeaffoLDu3FItIR6sEt2JXeaKWO+ERUFCWxYsxwKZB6X9r94HUvIryv5xWJDSYrMMRLsa1fc= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578399356549861.3738845193767; Tue, 7 Jan 2020 04:15:56 -0800 (PST) Received: from localhost ([::1]:47546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ionm6-0000OK-4z for importer@patchew.org; Tue, 07 Jan 2020 07:15:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39461) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iomyc-0001vp-NB for qemu-devel@nongnu.org; Tue, 07 Jan 2020 06:24:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iomyb-0006SB-5L for qemu-devel@nongnu.org; Tue, 07 Jan 2020 06:24:46 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:43023 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iomyb-0006Rr-1b for qemu-devel@nongnu.org; Tue, 07 Jan 2020 06:24:45 -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-388-gzegDAJSM76S09SbsCEWGA-1; Tue, 07 Jan 2020 06:24:43 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 787F72EDA for ; Tue, 7 Jan 2020 11:24:42 +0000 (UTC) Received: from localhost (unknown [10.36.118.91]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8ED215D9CA; Tue, 7 Jan 2020 11:24:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578396284; 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; bh=LZaehhwnm5cEFqqWuj5gsjbWKlzGOEjtaCN2sNyD9Tg=; b=MGC/kaU6f3ZsSVvjWuksw8OrUVXfB6Vq8plUXBDwXSDP+XX9Auyo3ynHrwa+J9pvbO++e2 w89a6zCrR/lFLVbLM+sILCINudy8TTLIM+DcldceZPsehsbZoFDQKm97KOgs8YyqoreXrf TRUh8kgJ2D78fXktMHgSBuvpdU/DFlw= From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH] trace: update qemu-trace-stap to Python 3 Date: Tue, 7 Jan 2020 11:24:38 +0000 Message-Id: <20200107112438.383958-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: gzegDAJSM76S09SbsCEWGA-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.120 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: Daniel Berrange , "Dr. David Alan Gilbert" , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" qemu-trace-stap does not support Python 3 yet: $ scripts/qemu-trace-stap list path/to/qemu-system-x86_64 Traceback (most recent call last): File "scripts/qemu-trace-stap", line 175, in main() File "scripts/qemu-trace-stap", line 171, in main args.func(args) File "scripts/qemu-trace-stap", line 118, in cmd_list print_probes(args.verbose, "*") File "scripts/qemu-trace-stap", line 114, in print_probes if line.startswith(prefix): TypeError: startswith first arg must be bytes or a tuple of bytes, not str Now that QEMU requires Python 3.5 or later we can switch to pure Python 3. Use Popen()'s universal_newlines=3DTrue argument to treat stdout as text instead of binary. Fixes: 62dd1048c0bd ("trace: add ability to do simple printf logging via sy= stemtap") Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=3D1787395 Signed-off-by: Stefan Hajnoczi Reviewed-by: Daniel P. Berrang=C3=A9 --- scripts/qemu-trace-stap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/qemu-trace-stap b/scripts/qemu-trace-stap index 91d1051cdc..90527eb974 100755 --- a/scripts/qemu-trace-stap +++ b/scripts/qemu-trace-stap @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 # -*- python -*- # # Copyright (C) 2019 Red Hat, Inc @@ -18,8 +18,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, see . =20 -from __future__ import print_function - import argparse import copy import os.path @@ -104,7 +102,9 @@ def cmd_list(args): if verbose: print("Listing probes with name '%s'" % script) proc =3D subprocess.Popen(["stap", "-l", script], - stdout=3Dsubprocess.PIPE, env=3Dtapset_env= (tapsets)) + stdout=3Dsubprocess.PIPE, + universal_newlines=3DTrue, + env=3Dtapset_env(tapsets)) out, err =3D proc.communicate() if proc.returncode !=3D 0: print("No probes found, are the tapsets installed in %s" % tap= set_dir(args.binary)) --=20 2.24.1