qemu.py: Pylint/style fixes
No actual code changes, just several pylint/style fixes and docstring clarifications. Signed-off-by: Lukáš Doktor <ldoktor@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Message-Id: <20170818142613.32394-2-ldoktor@redhat.com> Reviewed-by: Cleber Rosa <crosa@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
5faf2d376a
commit
2d853c70a2
|
@ -30,8 +30,22 @@ class QEMUMachine(object):
|
||||||
# vm is guaranteed to be shut down here
|
# vm is guaranteed to be shut down here
|
||||||
'''
|
'''
|
||||||
|
|
||||||
def __init__(self, binary, args=[], wrapper=[], name=None, test_dir="/var/tmp",
|
def __init__(self, binary, args=[], wrapper=[], name=None,
|
||||||
monitor_address=None, socket_scm_helper=None, debug=False):
|
test_dir="/var/tmp", monitor_address=None,
|
||||||
|
socket_scm_helper=None, debug=False):
|
||||||
|
'''
|
||||||
|
Initialize a QEMUMachine
|
||||||
|
|
||||||
|
@param binary: path to the qemu binary
|
||||||
|
@param args: list of extra arguments
|
||||||
|
@param wrapper: list of arguments used as prefix to qemu binary
|
||||||
|
@param name: prefix for socket and log file names (default: qemu-PID)
|
||||||
|
@param test_dir: where to create socket and log file
|
||||||
|
@param monitor_address: address for QMP monitor
|
||||||
|
@param socket_scm_helper: helper program, required for send_fd_scm()"
|
||||||
|
@param debug: enable debug mode
|
||||||
|
@note: Qemu process is not started until launch() is used.
|
||||||
|
'''
|
||||||
if name is None:
|
if name is None:
|
||||||
name = "qemu-%d" % os.getpid()
|
name = "qemu-%d" % os.getpid()
|
||||||
if monitor_address is None:
|
if monitor_address is None:
|
||||||
|
@ -46,6 +60,7 @@ class QEMUMachine(object):
|
||||||
self._iolog = None
|
self._iolog = None
|
||||||
self._socket_scm_helper = socket_scm_helper
|
self._socket_scm_helper = socket_scm_helper
|
||||||
self._debug = debug
|
self._debug = debug
|
||||||
|
self._qmp = None
|
||||||
|
|
||||||
def __enter__(self):
|
def __enter__(self):
|
||||||
return self
|
return self
|
||||||
|
@ -78,16 +93,16 @@ class QEMUMachine(object):
|
||||||
if self._socket_scm_helper is None:
|
if self._socket_scm_helper is None:
|
||||||
print >>sys.stderr, "No path to socket_scm_helper set"
|
print >>sys.stderr, "No path to socket_scm_helper set"
|
||||||
return -1
|
return -1
|
||||||
if os.path.exists(self._socket_scm_helper) == False:
|
if not os.path.exists(self._socket_scm_helper):
|
||||||
print >>sys.stderr, "%s does not exist" % self._socket_scm_helper
|
print >>sys.stderr, "%s does not exist" % self._socket_scm_helper
|
||||||
return -1
|
return -1
|
||||||
fd_param = ["%s" % self._socket_scm_helper,
|
fd_param = ["%s" % self._socket_scm_helper,
|
||||||
"%d" % self._qmp.get_sock_fd(),
|
"%d" % self._qmp.get_sock_fd(),
|
||||||
"%s" % fd_file_path]
|
"%s" % fd_file_path]
|
||||||
devnull = open('/dev/null', 'rb')
|
devnull = open('/dev/null', 'rb')
|
||||||
p = subprocess.Popen(fd_param, stdin=devnull, stdout=sys.stdout,
|
proc = subprocess.Popen(fd_param, stdin=devnull, stdout=sys.stdout,
|
||||||
stderr=sys.stderr)
|
stderr=sys.stderr)
|
||||||
return p.wait()
|
return proc.wait()
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _remove_if_exists(path):
|
def _remove_if_exists(path):
|
||||||
|
@ -113,8 +128,8 @@ class QEMUMachine(object):
|
||||||
return self._popen.pid
|
return self._popen.pid
|
||||||
|
|
||||||
def _load_io_log(self):
|
def _load_io_log(self):
|
||||||
with open(self._qemu_log_path, "r") as fh:
|
with open(self._qemu_log_path, "r") as iolog:
|
||||||
self._iolog = fh.read()
|
self._iolog = iolog.read()
|
||||||
|
|
||||||
def _base_args(self):
|
def _base_args(self):
|
||||||
if isinstance(self._monitor_address, tuple):
|
if isinstance(self._monitor_address, tuple):
|
||||||
|
@ -128,7 +143,8 @@ class QEMUMachine(object):
|
||||||
'-display', 'none', '-vga', 'none']
|
'-display', 'none', '-vga', 'none']
|
||||||
|
|
||||||
def _pre_launch(self):
|
def _pre_launch(self):
|
||||||
self._qmp = qmp.qmp.QEMUMonitorProtocol(self._monitor_address, server=True,
|
self._qmp = qmp.qmp.QEMUMonitorProtocol(self._monitor_address,
|
||||||
|
server=True,
|
||||||
debug=self._debug)
|
debug=self._debug)
|
||||||
|
|
||||||
def _post_launch(self):
|
def _post_launch(self):
|
||||||
|
@ -145,9 +161,11 @@ class QEMUMachine(object):
|
||||||
qemulog = open(self._qemu_log_path, 'wb')
|
qemulog = open(self._qemu_log_path, 'wb')
|
||||||
try:
|
try:
|
||||||
self._pre_launch()
|
self._pre_launch()
|
||||||
args = self._wrapper + [self._binary] + self._base_args() + self._args
|
args = (self._wrapper + [self._binary] + self._base_args() +
|
||||||
|
self._args)
|
||||||
self._popen = subprocess.Popen(args, stdin=devnull, stdout=qemulog,
|
self._popen = subprocess.Popen(args, stdin=devnull, stdout=qemulog,
|
||||||
stderr=subprocess.STDOUT, shell=False)
|
stderr=subprocess.STDOUT,
|
||||||
|
shell=False)
|
||||||
self._post_launch()
|
self._post_launch()
|
||||||
except:
|
except:
|
||||||
if self.is_running():
|
if self.is_running():
|
||||||
|
@ -168,23 +186,30 @@ class QEMUMachine(object):
|
||||||
|
|
||||||
exitcode = self._popen.wait()
|
exitcode = self._popen.wait()
|
||||||
if exitcode < 0:
|
if exitcode < 0:
|
||||||
sys.stderr.write('qemu received signal %i: %s\n' % (-exitcode, ' '.join(self._args)))
|
sys.stderr.write('qemu received signal %i: %s\n'
|
||||||
|
% (-exitcode, ' '.join(self._args)))
|
||||||
self._load_io_log()
|
self._load_io_log()
|
||||||
self._post_shutdown()
|
self._post_shutdown()
|
||||||
|
|
||||||
underscore_to_dash = string.maketrans('_', '-')
|
underscore_to_dash = string.maketrans('_', '-')
|
||||||
|
|
||||||
def qmp(self, cmd, conv_keys=True, **args):
|
def qmp(self, cmd, conv_keys=True, **args):
|
||||||
'''Invoke a QMP command and return the result dict'''
|
'''Invoke a QMP command and return the response dict'''
|
||||||
qmp_args = dict()
|
qmp_args = dict()
|
||||||
for k in args.keys():
|
for key in args.keys():
|
||||||
if conv_keys:
|
if conv_keys:
|
||||||
qmp_args[k.translate(self.underscore_to_dash)] = args[k]
|
qmp_args[key.translate(self.underscore_to_dash)] = args[key]
|
||||||
else:
|
else:
|
||||||
qmp_args[k] = args[k]
|
qmp_args[key] = args[key]
|
||||||
|
|
||||||
return self._qmp.cmd(cmd, args=qmp_args)
|
return self._qmp.cmd(cmd, args=qmp_args)
|
||||||
|
|
||||||
def command(self, cmd, conv_keys=True, **args):
|
def command(self, cmd, conv_keys=True, **args):
|
||||||
|
'''
|
||||||
|
Invoke a QMP command.
|
||||||
|
On success return the response dict.
|
||||||
|
On failure raise an exception.
|
||||||
|
'''
|
||||||
reply = self.qmp(cmd, conv_keys, **args)
|
reply = self.qmp(cmd, conv_keys, **args)
|
||||||
if reply is None:
|
if reply is None:
|
||||||
raise Exception("Monitor is closed")
|
raise Exception("Monitor is closed")
|
||||||
|
@ -207,7 +232,15 @@ class QEMUMachine(object):
|
||||||
return events
|
return events
|
||||||
|
|
||||||
def event_wait(self, name, timeout=60.0, match=None):
|
def event_wait(self, name, timeout=60.0, match=None):
|
||||||
# Test if 'match' is a recursive subset of 'event'
|
'''
|
||||||
|
Wait for specified timeout on named event in QMP; optionally filter
|
||||||
|
results by match.
|
||||||
|
|
||||||
|
The 'match' is checked to be a recursive subset of the 'event'; skips
|
||||||
|
branch processing on match's value None
|
||||||
|
{"foo": {"bar": 1}} matches {"foo": None}
|
||||||
|
{"foo": {"bar": 1}} does not matches {"foo": {"baz": None}}
|
||||||
|
'''
|
||||||
def event_match(event, match=None):
|
def event_match(event, match=None):
|
||||||
if match is None:
|
if match is None:
|
||||||
return True
|
return True
|
||||||
|
@ -240,4 +273,8 @@ class QEMUMachine(object):
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def get_log(self):
|
def get_log(self):
|
||||||
|
'''
|
||||||
|
After self.shutdown or failed qemu execution, this returns the output
|
||||||
|
of the qemu process.
|
||||||
|
'''
|
||||||
return self._iolog
|
return self._iolog
|
||||||
|
|
Loading…
Reference in a new issue