Pull request

-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAl4diecACgkQnKSrs4Gr
 c8jV0Qf/ZaR2ygd1vypm2GYsrg99XNjZNStWcRphev6ZUV/Kx04mlmDjDHTwnLmF
 roU9/kEmaN6E7Ms0w96Mn2PAR+gJCnNNNOmXA0Pbo7RSzgtmzV2m64NHU0rpG9nO
 rWVT+ALbNecQgYPy29chEiJAyUZCNk1QyyNHMaEC+mnZpwjGQKJiLF02HknITFoJ
 Hrzzw/5yRhFvTwkoVBy6TWTpSq4/8i7BFNzfktwZejq3sZXrATK+txJZxzLDXR12
 lzP2g45SOCKfzaCy1sNkF74+1M04HSIHhDeJ2egDOlbhaZjYUZH46pmvQuB1aJA2
 G38tRnqJLcDv0zbYsojelpsSeLLI7Q==
 =0XT1
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

Pull request

# gpg: Signature made Tue 14 Jan 2020 09:29:11 GMT
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace: update qemu-trace-stap to Python 3

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2020-01-14 11:15:30 +00:00
commit 29234ded1f

View file

@ -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 <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, env=tapset_env(tapsets))
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" % tapset_dir(args.binary))