summaryrefslogtreecommitdiffstats
path: root/scripts/qemu.py
diff options
context:
space:
mode:
authorPeter Maydell2019-01-18 16:56:41 +0100
committerPeter Maydell2019-01-18 16:56:41 +0100
commit9bd641b10a13a21799a9ef9e010d062343cc3b93 (patch)
treec044098440d94d10f9b00030ae1a118dc3099b8b /scripts/qemu.py
parentMerge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff)
parentscripts/replay-dump.py: fix utf-8 mangling (diff)
downloadqemu-9bd641b10a13a21799a9ef9e010d062343cc3b93.tar.gz
qemu-9bd641b10a13a21799a9ef9e010d062343cc3b93.tar.xz
qemu-9bd641b10a13a21799a9ef9e010d062343cc3b93.zip
Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging
Python queue, 2019-01-17 Fixes: * Actually test different Python versions on Travis CI * Fix qemu.py error message when qemu dies from signal Cleanups: * Track Python version on config-host.mak * Remove fixed crashes from scripts/device-crash-test * Acceptance tests: Linux initrd checking test * Fix utf-8 mangling at scripts/replay-dump.py * Remove unused python imports from multiple scripts # gpg: Signature made Thu 17 Jan 2019 20:16:41 GMT # gpg: using RSA key 2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/python-next-pull-request: scripts/replay-dump.py: fix utf-8 mangling qemu.py: Fix error message when qemu dies from signal Acceptance tests: add Linux initrd checking test check-help: visual and content improvements Travis CI: make specified Python versions usable on jobs check-venv: use recorded Python version configure: keep track of Python version scripts: Remove unused python imports scripts/device-crash-test: Remove known crashes Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qemu.py')
-rw-r--r--scripts/qemu.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/qemu.py b/scripts/qemu.py
index 6e3b0e6771..0a5e02eb56 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -351,7 +351,7 @@ class QEMUMachine(object):
command = ' '.join(self._qemu_full_args)
else:
command = ''
- LOG.warn(msg, exitcode, command)
+ LOG.warn(msg, -exitcode, command)
self._launched = False