[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PULL 1/1] trace: update qemu-trace-stap to Python 3

From: Philippe Mathieu-Daudé
Subject: Re: [PULL 1/1] trace: update qemu-trace-stap to Python 3
Date: Tue, 14 Jan 2020 14:00:46 +0100
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2

On 1/14/20 10:29 AM, Stefan Hajnoczi wrote:
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 <module>
     File "scripts/qemu-trace-stap", line 171, in main
     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=True argument to treat stdout as
text instead of binary.

Fixes: 62dd1048c0bd ("trace: add ability to do simple printf logging via 
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1787395
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Message-id: address@hidden
Message-Id: <address@hidden>

One Message-Id is enough ;)

Signed-off-by: Stefan Hajnoczi <address@hidden>
  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/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 <http://www.gnu.org/licenses/>.
-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 = subprocess.Popen(["stap", "-l", script],
-                                stdout=subprocess.PIPE, 
+                                stdout=subprocess.PIPE,
+                                universal_newlines=True,
+                                env=tapset_env(tapsets))
          out, err = proc.communicate()
          if proc.returncode != 0:
              print("No probes found, are the tapsets installed in %s" % 

reply via email to

[Prev in Thread] Current Thread [Next in Thread]