* [PULL 0/1] Tracing patches @ 2020-01-14 9:29 Stefan Hajnoczi 2020-01-14 9:29 ` [PULL 1/1] trace: update qemu-trace-stap to Python 3 Stefan Hajnoczi 2020-01-14 14:11 ` [PULL 0/1] Tracing patches Peter Maydell 0 siblings, 2 replies; 4+ messages in thread From: Stefan Hajnoczi @ 2020-01-14 9:29 UTC (permalink / raw) To: qemu-devel; +Cc: Peter Maydell, Stefan Hajnoczi The following changes since commit dc65a5bdc9fa543690a775b50d4ffbeb22c56d6d: Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-5.0-20200108' into staging (2020-01-10 16:15:04 +0000) are available in the Git repository at: https://github.com/stefanha/qemu.git tags/tracing-pull-request for you to fetch changes up to 3f0097169bb60268cc5dda0c5ea47c31ab57b22f: trace: update qemu-trace-stap to Python 3 (2020-01-13 16:42:20 +0000) ---------------------------------------------------------------- Pull request ---------------------------------------------------------------- Stefan Hajnoczi (1): trace: update qemu-trace-stap to Python 3 scripts/qemu-trace-stap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.24.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PULL 1/1] trace: update qemu-trace-stap to Python 3 2020-01-14 9:29 [PULL 0/1] Tracing patches Stefan Hajnoczi @ 2020-01-14 9:29 ` Stefan Hajnoczi 2020-01-14 13:00 ` Philippe Mathieu-Daudé 2020-01-14 14:11 ` [PULL 0/1] Tracing patches Peter Maydell 1 sibling, 1 reply; 4+ messages in thread From: Stefan Hajnoczi @ 2020-01-14 9:29 UTC (permalink / raw) To: qemu-devel; +Cc: Peter Maydell, Daniel P . Berrangé, Stefan Hajnoczi 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> 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=True argument to treat stdout as text instead of binary. Fixes: 62dd1048c0bd ("trace: add ability to do simple printf logging via systemtap") Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1787395 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Message-id: 20200107112438.383958-1-stefanha@redhat.com Message-Id: <20200107112438.383958-1-stefanha@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- 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 <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)) -- 2.24.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PULL 1/1] trace: update qemu-trace-stap to Python 3 2020-01-14 9:29 ` [PULL 1/1] trace: update qemu-trace-stap to Python 3 Stefan Hajnoczi @ 2020-01-14 13:00 ` Philippe Mathieu-Daudé 0 siblings, 0 replies; 4+ messages in thread From: Philippe Mathieu-Daudé @ 2020-01-14 13:00 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel; +Cc: Peter Maydell, Daniel P . Berrangé 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> > 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=True argument to treat stdout as > text instead of binary. > > Fixes: 62dd1048c0bd ("trace: add ability to do simple printf logging via systemtap") > Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1787395 > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > Message-id: 20200107112438.383958-1-stefanha@redhat.com > Message-Id: <20200107112438.383958-1-stefanha@redhat.com> One Message-Id is enough ;) > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > 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 <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)) > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PULL 0/1] Tracing patches 2020-01-14 9:29 [PULL 0/1] Tracing patches Stefan Hajnoczi 2020-01-14 9:29 ` [PULL 1/1] trace: update qemu-trace-stap to Python 3 Stefan Hajnoczi @ 2020-01-14 14:11 ` Peter Maydell 1 sibling, 0 replies; 4+ messages in thread From: Peter Maydell @ 2020-01-14 14:11 UTC (permalink / raw) To: Stefan Hajnoczi; +Cc: QEMU Developers On Tue, 14 Jan 2020 at 09:29, Stefan Hajnoczi <stefanha@redhat.com> wrote: > > The following changes since commit dc65a5bdc9fa543690a775b50d4ffbeb22c56d6d: > > Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-5.0-20200108' into staging (2020-01-10 16:15:04 +0000) > > are available in the Git repository at: > > https://github.com/stefanha/qemu.git tags/tracing-pull-request > > for you to fetch changes up to 3f0097169bb60268cc5dda0c5ea47c31ab57b22f: > > trace: update qemu-trace-stap to Python 3 (2020-01-13 16:42:20 +0000) > > ---------------------------------------------------------------- > Pull request > > ---------------------------------------------------------------- Applied, thanks. Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0 for any user-visible changes. -- PMM ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-01-14 14:12 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-01-14 9:29 [PULL 0/1] Tracing patches Stefan Hajnoczi 2020-01-14 9:29 ` [PULL 1/1] trace: update qemu-trace-stap to Python 3 Stefan Hajnoczi 2020-01-14 13:00 ` Philippe Mathieu-Daudé 2020-01-14 14:11 ` [PULL 0/1] Tracing patches Peter Maydell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).