diff options
| author | John Snow <jsnow@redhat.com> | 2020-07-10 01:06:48 -0400 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@redhat.com> | 2020-07-14 22:22:22 +0200 |
| commit | de6e08b5b987afbaf22e37e7f9e34421fb76ef3f (patch) | |
| tree | 57644f9671d7e37e693e15f0ba6ecf5ae3dfb35a /python | |
| parent | 193bf1c061ce0bb078ebc153facb9f31fe139d72 (diff) | |
| download | qemu-de6e08b5b987afbaf22e37e7f9e34421fb76ef3f.zip qemu-de6e08b5b987afbaf22e37e7f9e34421fb76ef3f.tar.gz qemu-de6e08b5b987afbaf22e37e7f9e34421fb76ef3f.tar.bz2 | |
python/machine.py: re-add sigkill warning suppression
If the user kills QEMU on purpose, we don't need to warn
them about that having happened: they know already.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
Message-Id: <20200710050649.32434-12-jsnow@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Diffstat (limited to 'python')
| -rw-r--r-- | python/qemu/machine.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/python/qemu/machine.py b/python/qemu/machine.py index a955e3f..736a3c9 100644 --- a/python/qemu/machine.py +++ b/python/qemu/machine.py @@ -22,6 +22,7 @@ import logging import os import subprocess import shutil +import signal import socket import tempfile from typing import Optional, Type @@ -133,6 +134,7 @@ class QEMUMachine: self._console_address = None self._console_socket = None self._remove_files = [] + self._user_killed = False self._console_log_path = console_log if self._console_log_path: # In order to log the console, buffering needs to be enabled. @@ -327,7 +329,8 @@ class QEMUMachine: self._remove_if_exists(self._remove_files.pop()) exitcode = self.exitcode() - if exitcode is not None and exitcode < 0: + if (exitcode is not None and exitcode < 0 + and not (self._user_killed and exitcode == -signal.SIGKILL)): msg = 'qemu received signal %i; command: "%s"' if self._qemu_full_args: command = ' '.join(self._qemu_full_args) @@ -335,6 +338,7 @@ class QEMUMachine: command = '' LOG.warning(msg, -int(exitcode), command) + self._user_killed = False self._launched = False def launch(self): @@ -469,6 +473,7 @@ class QEMUMachine: try: if hard: + self._user_killed = True self._hard_shutdown() else: self._do_shutdown(has_quit, timeout=timeout) |