[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/15] qemu.py: avoid writing to stdout/stderr
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 12/15] qemu.py: avoid writing to stdout/stderr |
Date: |
Fri, 15 Sep 2017 20:37:36 -0300 |
From: Amador Pahim <address@hidden>
This module should not write directly to stdout/stderr. Instead, it
should either raise exceptions or just log the messages and let the
callers handle them and decide what to do. For example, scripts could
choose to send the log messages stderr or/and write them to a file if
verbose or debugging mode is enabled.
This patch replaces the writes to stderr by an exception in the
send_fd_scm() when _socket_scm_helper is not set or not present. In the
same method, the subprocess Popen will now redirect the stdout/stderr to
logging.debug instead of writing to system stderr. As consequence, since
the Popen.communicate() is now used (in order to get the stdout), the
further call to wait() became redundant and was replaced by
Popen.returncode.
The shutdown() message on negative exit code will now be logged
to logging.warn instead of written to system stderr.
Signed-off-by: Amador Pahim <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
scripts/qemu.py | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/scripts/qemu.py b/scripts/qemu.py
index f80b008f7f..8d3d24dd2b 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -13,12 +13,22 @@
#
import errno
+import logging
import os
import sys
import subprocess
import qmp.qmp
+LOG = logging.getLogger(__name__)
+
+
+class QEMUMachineError(Exception):
+ """
+ Exception called when an error in QEMUMachine happens.
+ """
+
+
class MonitorResponseError(qmp.qmp.QMPError):
'''
Represents erroneous QMP monitor reply
@@ -107,18 +117,21 @@ class QEMUMachine(object):
# In iotest.py, the qmp should always use unix socket.
assert self._qmp.is_scm_available()
if self._socket_scm_helper is None:
- print >>sys.stderr, "No path to socket_scm_helper set"
- return -1
+ raise QEMUMachineError("No path to socket_scm_helper set")
if not os.path.exists(self._socket_scm_helper):
- print >>sys.stderr, "%s does not exist" % self._socket_scm_helper
- return -1
+ raise QEMUMachineError("%s does not exist" %
+ self._socket_scm_helper)
fd_param = ["%s" % self._socket_scm_helper,
"%d" % self._qmp.get_sock_fd(),
"%s" % fd_file_path]
devnull = open('/dev/null', 'rb')
- proc = subprocess.Popen(fd_param, stdin=devnull, stdout=sys.stdout,
- stderr=sys.stderr)
- return proc.wait()
+ proc = subprocess.Popen(fd_param, stdin=devnull,
stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT)
+ output = proc.communicate()[0]
+ if output:
+ LOG.debug(output)
+
+ return proc.returncode
@staticmethod
def _remove_if_exists(path):
@@ -202,8 +215,8 @@ class QEMUMachine(object):
exitcode = self._popen.wait()
if exitcode < 0:
- sys.stderr.write('qemu received signal %i: %s\n'
- % (-exitcode, ' '.join(self._args)))
+ LOG.warn('qemu received signal %i: %s', -exitcode,
+ ' '.join(self._args))
self._load_io_log()
self._post_shutdown()
--
2.13.5
- [Qemu-devel] [PULL 02/15] qemu|qtest: Avoid dangerous arguments, (continued)
- [Qemu-devel] [PULL 02/15] qemu|qtest: Avoid dangerous arguments, Eduardo Habkost, 2017/09/15
- [Qemu-devel] [PULL 03/15] qemu.py: Use iteritems rather than keys(), Eduardo Habkost, 2017/09/15
- [Qemu-devel] [PULL 04/15] qemu.py: Simplify QMP key-conversion, Eduardo Habkost, 2017/09/15
- [Qemu-devel] [PULL 05/15] qemu.py: Use custom exceptions rather than Exception, Eduardo Habkost, 2017/09/15
- [Qemu-devel] [PULL 07/15] qmp.py: Use object-based class for QEMUMonitorProtocol, Eduardo Habkost, 2017/09/15
- [Qemu-devel] [PULL 06/15] qmp.py: Couple of pylint/style fixes, Eduardo Habkost, 2017/09/15
- [Qemu-devel] [PULL 08/15] qmp.py: Avoid "has_key" usage, Eduardo Habkost, 2017/09/15
- [Qemu-devel] [PULL 09/15] qmp.py: Avoid overriding a builtin object, Eduardo Habkost, 2017/09/15
- [Qemu-devel] [PULL 10/15] qtest.py: Few pylint/style fixes, Eduardo Habkost, 2017/09/15
- [Qemu-devel] [PULL 11/15] qemu.py: fix is_running() return before first launch(), Eduardo Habkost, 2017/09/15
- [Qemu-devel] [PULL 12/15] qemu.py: avoid writing to stdout/stderr,
Eduardo Habkost <=
- [Qemu-devel] [PULL 13/15] qemu.py: use os.path.null instead of /dev/null, Eduardo Habkost, 2017/09/15
- [Qemu-devel] [PULL 14/15] qemu.py: improve message on negative exit code, Eduardo Habkost, 2017/09/15
- [Qemu-devel] [PULL 15/15] qemu.py: include debug information on launch error, Eduardo Habkost, 2017/09/15
- Re: [Qemu-devel] [PULL 00/15] Python queue, 2017-09-15, Peter Maydell, 2017/09/16