diff options
| author | Peter Maydell | 2020-06-25 15:31:35 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-06-25 15:31:35 +0200 |
| commit | beafab86a3062489cffd58d6608e64df98e256f1 (patch) | |
| tree | c33fed79be046c7ff6a48d33db83ef3d78591d14 /scripts/tracetool/vcpu.py | |
| parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-qdev-2020-06-23' into ... (diff) | |
| parent | trace/simple: Fix unauthorized enable (diff) | |
| download | qemu-beafab86a3062489cffd58d6608e64df98e256f1.tar.gz qemu-beafab86a3062489cffd58d6608e64df98e256f1.tar.xz qemu-beafab86a3062489cffd58d6608e64df98e256f1.zip | |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/tracetool/vcpu.py')
| -rw-r--r-- | scripts/tracetool/vcpu.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/tracetool/vcpu.py b/scripts/tracetool/vcpu.py index 0b104e4f15..b54e4f4e7a 100644 --- a/scripts/tracetool/vcpu.py +++ b/scripts/tracetool/vcpu.py @@ -10,7 +10,7 @@ __copyright__ = "Copyright 2016, 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 Arguments, try_import |