Commit 4738b0a8 authored by Amador Pahim's avatar Amador Pahim Committed by Eduardo Habkost
Browse files

qemu.py: avoid writing to stdout/stderr 



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: default avatarAmador Pahim <apahim@redhat.com>
Message-Id: <20170901112829.2571-3-apahim@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent f6cf7f5a

scripts/qemu.py

+22 −9
Original line number Diff line number Diff line
@@ -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()