Commit beafab86 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Pull request

# gpg: Signature made Wed 24 Jun 2020 11:25:27 BST
# 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/simple: Fix unauthorized enable
  scripts/tracetool: Update maintainer email address

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0250c595 db25d56c

scripts/tracetool.py

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ __copyright__ = "Copyright 2012-2014, Lluís Vilanova <vilanova@ac.upc.edu>" 
__license__    = "GPL version 2 or (at your option) any later version"



__maintainer__ = "Stefan Hajnoczi"

__email__      = "stefanha@linux.vnet.ibm.com"

__email__      = "stefanha@redhat.com"





import sys

scripts/tracetool/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ __copyright__ = "Copyright 2012-2017, Lluís Vilanova <vilanova@ac.upc.edu>" 
__license__    = "GPL version 2 or (at your option) any later version"



__maintainer__ = "Stefan Hajnoczi"

__email__      = "stefanha@linux.vnet.ibm.com"

__email__      = "stefanha@redhat.com"





import re

scripts/tracetool/backend/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ __copyright__ = "Copyright 2012-2014, Lluís Vilanova <vilanova@ac.upc.edu>" 
__license__    = "GPL version 2 or (at your option) any later version"



__maintainer__ = "Stefan Hajnoczi"

__email__      = "stefanha@linux.vnet.ibm.com"

__email__      = "stefanha@redhat.com"





import os

scripts/tracetool/backend/dtrace.py

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ __copyright__ = "Copyright 2012-2017, Lluís Vilanova <vilanova@ac.upc.edu>" 
__license__    = "GPL version 2 or (at your option) any later version"



__maintainer__ = "Stefan Hajnoczi"

__email__      = "stefanha@linux.vnet.ibm.com"

__email__      = "stefanha@redhat.com"





from tracetool import out

scripts/tracetool/backend/log.py

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ __copyright__ = "Copyright 2012-2017, Lluís Vilanova <vilanova@ac.upc.edu>" 
__license__    = "GPL version 2 or (at your option) any later version"



__maintainer__ = "Stefan Hajnoczi"

__email__      = "stefanha@linux.vnet.ibm.com"

__email__      = "stefanha@redhat.com"





from tracetool import out