From nobody Mon Apr 29 20:20:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559076378; cv=none; d=zoho.com; s=zohoarc; b=WqVB8mnvHJqpCEDaA15v8/s59IyWGSW7G/0WwPpJh3ekrHkAwiOE81KF721qizRnFMNMWz7GtmlbF9aRULlHgpd0sgDRLc/xscu8vVtcsBCS+gSbYBRN0Yxx6cmypMC18jh9cXrqnP6iCUMKkCwMZeyO6sWMDYHVSEUw/wzLCik= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559076378; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=gJBgQHsW0QP06vY1hb2k0HM6tarfEXupaVORkYq0gPc=; b=M6icI+Yc2HdrTQEUxKtdChGyXh6+M7Jx1g9M2kuKWpLgkE2eBZpyGx56MHwmjSkJg3eKWUkHRw1wa0H3pKorn/k/bJHIHKd1vJBHEAAFgUPhtS8RmyFKt11HzDITAhDDO2gQO12CQOnnp80k6H8aD3idZgDVnk+iNDNkKBFH97E= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 155907637868646.4310374094606; Tue, 28 May 2019 13:46:18 -0700 (PDT) Received: from localhost ([127.0.0.1]:42520 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hViz8-0007rY-Gp for importer@patchew.org; Tue, 28 May 2019 16:46:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVivZ-0005hE-3B for qemu-devel@nongnu.org; Tue, 28 May 2019 16:42:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVivV-0001CL-0U for qemu-devel@nongnu.org; Tue, 28 May 2019 16:42:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56652) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVivU-0001AU-Kt for qemu-devel@nongnu.org; Tue, 28 May 2019 16:42:28 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 174BD64122 for ; Tue, 28 May 2019 20:42:25 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-187.bos.redhat.com [10.18.17.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id 78122101E267; Tue, 28 May 2019 20:42:23 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Date: Tue, 28 May 2019 16:42:19 -0400 Message-Id: <20190528204220.9615-2-jsnow@redhat.com> In-Reply-To: <20190528204220.9615-1-jsnow@redhat.com> References: <20190528204220.9615-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 28 May 2019 20:42:28 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 1/2] python/qemu: split QEMUMachine out from underneath __init__.py X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Snow , ehabkost@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" It's not obvious that something named __init__.py actually houses important code that isn't relevant to python packaging glue. Move the QEMUMachine and related error classes out into their own module. Adjust users to the new import location. Signed-off-by: John Snow Reviewed-by: Eduardo Habkost --- python/qemu/__init__.py | 502 +-------------------- python/qemu/machine.py | 520 ++++++++++++++++++++++ python/qemu/qtest.py | 2 +- scripts/device-crash-test | 2 +- scripts/render_block_graph.py | 2 +- tests/acceptance/avocado_qemu/__init__.py | 2 +- tests/acceptance/virtio_version.py | 2 +- tests/migration/guestperf/engine.py | 22 +- tests/qemu-iotests/235 | 2 +- tests/vm/basevm.py | 3 +- 10 files changed, 540 insertions(+), 519 deletions(-) create mode 100644 python/qemu/machine.py diff --git a/python/qemu/__init__.py b/python/qemu/__init__.py index dbaf8a5311..6c919a3d56 100644 --- a/python/qemu/__init__.py +++ b/python/qemu/__init__.py @@ -12,17 +12,11 @@ # Based on qmp.py. # =20 -import errno import logging import os -import subprocess -import re -import shutil -import socket -import tempfile =20 from . import qmp - +from . import machine =20 LOG =3D logging.getLogger(__name__) =20 @@ -39,497 +33,3 @@ def kvm_available(target_arch=3DNone): if target_arch !=3D ADDITIONAL_ARCHES.get(host_arch): return False return os.access("/dev/kvm", os.R_OK | os.W_OK) - - -class QEMUMachineError(Exception): - """ - Exception called when an error in QEMUMachine happens. - """ - - -class QEMUMachineAddDeviceError(QEMUMachineError): - """ - Exception raised when a request to add a device can not be fulfilled - - The failures are caused by limitations, lack of information or conflic= ting - requests on the QEMUMachine methods. This exception does not represent - failures reported by the QEMU binary itself. - """ - -class MonitorResponseError(qmp.QMPError): - """ - Represents erroneous QMP monitor reply - """ - def __init__(self, reply): - try: - desc =3D reply["error"]["desc"] - except KeyError: - desc =3D reply - super(MonitorResponseError, self).__init__(desc) - self.reply =3D reply - - -class QEMUMachine(object): - """ - A QEMU VM - - Use this object as a context manager to ensure the QEMU process termin= ates:: - - with VM(binary) as vm: - ... - # vm is guaranteed to be shut down here - """ - - def __init__(self, binary, args=3DNone, wrapper=3DNone, name=3DNone, - test_dir=3D"/var/tmp", monitor_address=3DNone, - socket_scm_helper=3DNone): - ''' - 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-P= ID) - @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= () - @note: Qemu process is not started until launch() is used. - ''' - if args is None: - args =3D [] - if wrapper is None: - wrapper =3D [] - if name is None: - name =3D "qemu-%d" % os.getpid() - self._name =3D name - self._monitor_address =3D monitor_address - self._vm_monitor =3D None - self._qemu_log_path =3D None - self._qemu_log_file =3D None - self._popen =3D None - self._binary =3D binary - self._args =3D list(args) # Force copy args in case we modify = them - self._wrapper =3D wrapper - self._events =3D [] - self._iolog =3D None - self._socket_scm_helper =3D socket_scm_helper - self._qmp =3D None - self._qemu_full_args =3D None - self._test_dir =3D test_dir - self._temp_dir =3D None - self._launched =3D False - self._machine =3D None - self._console_set =3D False - self._console_device_type =3D None - self._console_address =3D None - self._console_socket =3D None - - # just in case logging wasn't configured by the main script: - logging.basicConfig() - - def __enter__(self): - return self - - def __exit__(self, exc_type, exc_val, exc_tb): - self.shutdown() - return False - - # This can be used to add an unused monitor instance. - def add_monitor_null(self): - self._args.append('-monitor') - self._args.append('null') - - def add_fd(self, fd, fdset, opaque, opts=3D''): - """ - Pass a file descriptor to the VM - """ - options =3D ['fd=3D%d' % fd, - 'set=3D%d' % fdset, - 'opaque=3D%s' % opaque] - if opts: - options.append(opts) - - # This did not exist before 3.4, but since then it is - # mandatory for our purpose - if hasattr(os, 'set_inheritable'): - os.set_inheritable(fd, True) - - self._args.append('-add-fd') - self._args.append(','.join(options)) - return self - - # Exactly one of fd and file_path must be given. - # (If it is file_path, the helper will open that file and pass its - # own fd) - def send_fd_scm(self, fd=3DNone, file_path=3DNone): - # In iotest.py, the qmp should always use unix socket. - assert self._qmp.is_scm_available() - if self._socket_scm_helper is None: - raise QEMUMachineError("No path to socket_scm_helper set") - if not os.path.exists(self._socket_scm_helper): - raise QEMUMachineError("%s does not exist" % - self._socket_scm_helper) - - # This did not exist before 3.4, but since then it is - # mandatory for our purpose - if hasattr(os, 'set_inheritable'): - os.set_inheritable(self._qmp.get_sock_fd(), True) - if fd is not None: - os.set_inheritable(fd, True) - - fd_param =3D ["%s" % self._socket_scm_helper, - "%d" % self._qmp.get_sock_fd()] - - if file_path is not None: - assert fd is None - fd_param.append(file_path) - else: - assert fd is not None - fd_param.append(str(fd)) - - devnull =3D open(os.path.devnull, 'rb') - proc =3D subprocess.Popen(fd_param, stdin=3Ddevnull, stdout=3Dsubp= rocess.PIPE, - stderr=3Dsubprocess.STDOUT, close_fds=3DFa= lse) - output =3D proc.communicate()[0] - if output: - LOG.debug(output) - - return proc.returncode - - @staticmethod - def _remove_if_exists(path): - """ - Remove file object at path if it exists - """ - try: - os.remove(path) - except OSError as exception: - if exception.errno =3D=3D errno.ENOENT: - return - raise - - def is_running(self): - return self._popen is not None and self._popen.poll() is None - - def exitcode(self): - if self._popen is None: - return None - return self._popen.poll() - - def get_pid(self): - if not self.is_running(): - return None - return self._popen.pid - - def _load_io_log(self): - if self._qemu_log_path is not None: - with open(self._qemu_log_path, "r") as iolog: - self._iolog =3D iolog.read() - - def _base_args(self): - if isinstance(self._monitor_address, tuple): - moncdev =3D "socket,id=3Dmon,host=3D%s,port=3D%s" % ( - self._monitor_address[0], - self._monitor_address[1]) - else: - moncdev =3D 'socket,id=3Dmon,path=3D%s' % self._vm_monitor - args =3D ['-chardev', moncdev, - '-mon', 'chardev=3Dmon,mode=3Dcontrol', - '-display', 'none', '-vga', 'none'] - if self._machine is not None: - args.extend(['-machine', self._machine]) - if self._console_set: - self._console_address =3D os.path.join(self._temp_dir, - self._name + "-console.so= ck") - chardev =3D ('socket,id=3Dconsole,path=3D%s,server,nowait' % - self._console_address) - args.extend(['-chardev', chardev]) - if self._console_device_type is None: - args.extend(['-serial', 'chardev:console']) - else: - device =3D '%s,chardev=3Dconsole' % self._console_device_t= ype - args.extend(['-device', device]) - return args - - def _pre_launch(self): - self._temp_dir =3D tempfile.mkdtemp(dir=3Dself._test_dir) - if self._monitor_address is not None: - self._vm_monitor =3D self._monitor_address - else: - self._vm_monitor =3D os.path.join(self._temp_dir, - self._name + "-monitor.sock") - self._qemu_log_path =3D os.path.join(self._temp_dir, self._name + = ".log") - self._qemu_log_file =3D open(self._qemu_log_path, 'wb') - - self._qmp =3D qmp.QEMUMonitorProtocol(self._vm_monitor, - server=3DTrue) - - def _post_launch(self): - self._qmp.accept() - - def _post_shutdown(self): - if self._qemu_log_file is not None: - self._qemu_log_file.close() - self._qemu_log_file =3D None - - self._qemu_log_path =3D None - - if self._console_socket is not None: - self._console_socket.close() - self._console_socket =3D None - - if self._temp_dir is not None: - shutil.rmtree(self._temp_dir) - self._temp_dir =3D None - - def launch(self): - """ - Launch the VM and make sure we cleanup and expose the - command line/output in case of exception - """ - - if self._launched: - raise QEMUMachineError('VM already launched') - - self._iolog =3D None - self._qemu_full_args =3D None - try: - self._launch() - self._launched =3D True - except: - self.shutdown() - - LOG.debug('Error launching VM') - if self._qemu_full_args: - LOG.debug('Command: %r', ' '.join(self._qemu_full_args)) - if self._iolog: - LOG.debug('Output: %r', self._iolog) - raise - - def _launch(self): - """ - Launch the VM and establish a QMP connection - """ - devnull =3D open(os.path.devnull, 'rb') - self._pre_launch() - self._qemu_full_args =3D (self._wrapper + [self._binary] + - self._base_args() + self._args) - LOG.debug('VM launch command: %r', ' '.join(self._qemu_full_args)) - self._popen =3D subprocess.Popen(self._qemu_full_args, - stdin=3Ddevnull, - stdout=3Dself._qemu_log_file, - stderr=3Dsubprocess.STDOUT, - shell=3DFalse, - close_fds=3DFalse) - self._post_launch() - - def wait(self): - """ - Wait for the VM to power off - """ - self._popen.wait() - self._qmp.close() - self._load_io_log() - self._post_shutdown() - - def shutdown(self): - """ - Terminate the VM and clean up - """ - if self.is_running(): - try: - self._qmp.cmd('quit') - self._qmp.close() - except: - self._popen.kill() - self._popen.wait() - - self._load_io_log() - self._post_shutdown() - - exitcode =3D self.exitcode() - if exitcode is not None and exitcode < 0: - msg =3D 'qemu received signal %i: %s' - if self._qemu_full_args: - command =3D ' '.join(self._qemu_full_args) - else: - command =3D '' - LOG.warn(msg, -exitcode, command) - - self._launched =3D False - - def qmp(self, cmd, conv_keys=3DTrue, **args): - """ - Invoke a QMP command and return the response dict - """ - qmp_args =3D dict() - for key, value in args.items(): - if conv_keys: - qmp_args[key.replace('_', '-')] =3D value - else: - qmp_args[key] =3D value - - return self._qmp.cmd(cmd, args=3Dqmp_args) - - def command(self, cmd, conv_keys=3DTrue, **args): - """ - Invoke a QMP command. - On success return the response dict. - On failure raise an exception. - """ - reply =3D self.qmp(cmd, conv_keys, **args) - if reply is None: - raise qmp.QMPError("Monitor is closed") - if "error" in reply: - raise MonitorResponseError(reply) - return reply["return"] - - def get_qmp_event(self, wait=3DFalse): - """ - Poll for one queued QMP events and return it - """ - if len(self._events) > 0: - return self._events.pop(0) - return self._qmp.pull_event(wait=3Dwait) - - def get_qmp_events(self, wait=3DFalse): - """ - Poll for queued QMP events and return a list of dicts - """ - events =3D self._qmp.get_events(wait=3Dwait) - events.extend(self._events) - del self._events[:] - self._qmp.clear_events() - return events - - @staticmethod - def event_match(event, match=3DNone): - """ - Check if an event matches optional match criteria. - - The match criteria takes the form of a matching subdict. The event= is - checked to be a superset of the subdict, recursively, with matching - values whenever the subdict values are not None. - - This has a limitation that you cannot explicitly check for None va= lues. - - Examples, with the subdict queries on the left: - - None matches any object. - - {"foo": None} matches {"foo": {"bar": 1}} - - {"foo": None} matches {"foo": 5} - - {"foo": {"abc": None}} does not match {"foo": {"bar": 1}} - - {"foo": {"rab": 2}} matches {"foo": {"bar": 1, "rab": 2}} - """ - if match is None: - return True - - try: - for key in match: - if key in event: - if not QEMUMachine.event_match(event[key], match[key]): - return False - else: - return False - return True - except TypeError: - # either match or event wasn't iterable (not a dict) - return match =3D=3D event - - def event_wait(self, name, timeout=3D60.0, match=3DNone): - """ - event_wait waits for and returns a named event from QMP with a tim= eout. - - name: The event to wait for. - timeout: QEMUMonitorProtocol.pull_event timeout parameter. - match: Optional match criteria. See event_match for details. - """ - return self.events_wait([(name, match)], timeout) - - def events_wait(self, events, timeout=3D60.0): - """ - events_wait waits for and returns a named event from QMP with a ti= meout. - - events: a sequence of (name, match_criteria) tuples. - The match criteria are optional and may be None. - See event_match for details. - timeout: QEMUMonitorProtocol.pull_event timeout parameter. - """ - def _match(event): - for name, match in events: - if (event['event'] =3D=3D name and - self.event_match(event, match)): - return True - return False - - # Search cached events - for event in self._events: - if _match(event): - self._events.remove(event) - return event - - # Poll for new events - while True: - event =3D self._qmp.pull_event(wait=3Dtimeout) - if _match(event): - return event - self._events.append(event) - - return None - - def get_log(self): - """ - After self.shutdown or failed qemu execution, this returns the out= put - of the qemu process. - """ - return self._iolog - - def add_args(self, *args): - """ - Adds to the list of extra arguments to be given to the QEMU binary - """ - self._args.extend(args) - - def set_machine(self, machine_type): - """ - Sets the machine type - - If set, the machine type will be added to the base arguments - of the resulting QEMU command line. - """ - self._machine =3D machine_type - - def set_console(self, device_type=3DNone): - """ - Sets the device type for a console device - - If set, the console device and a backing character device will - be added to the base arguments of the resulting QEMU command - line. - - This is a convenience method that will either use the provided - device type, or default to a "-serial chardev:console" command - line argument. - - The actual setting of command line arguments will be be done at - machine launch time, as it depends on the temporary directory - to be created. - - @param device_type: the device type, such as "isa-serial". If - None is given (the default value) a "-serial - chardev:console" command line argument will - be used instead, resorting to the machine's - default device type. - """ - self._console_set =3D True - self._console_device_type =3D device_type - - @property - def console_socket(self): - """ - Returns a socket connected to the console - """ - if self._console_socket is None: - self._console_socket =3D socket.socket(socket.AF_UNIX, - socket.SOCK_STREAM) - self._console_socket.connect(self._console_address) - return self._console_socket diff --git a/python/qemu/machine.py b/python/qemu/machine.py new file mode 100644 index 0000000000..a8a311b035 --- /dev/null +++ b/python/qemu/machine.py @@ -0,0 +1,520 @@ +# QEMU library +# +# Copyright (C) 2015-2016 Red Hat Inc. +# Copyright (C) 2012 IBM Corp. +# +# Authors: +# Fam Zheng +# +# This work is licensed under the terms of the GNU GPL, version 2. See +# the COPYING file in the top-level directory. +# +# Based on qmp.py. +# + +import errno +import logging +import os +import subprocess +import re +import shutil +import socket +import tempfile + +from . import qmp + +LOG =3D logging.getLogger(__name__) + +class QEMUMachineError(Exception): + """ + Exception called when an error in QEMUMachine happens. + """ + + +class QEMUMachineAddDeviceError(QEMUMachineError): + """ + Exception raised when a request to add a device can not be fulfilled + + The failures are caused by limitations, lack of information or conflic= ting + requests on the QEMUMachine methods. This exception does not represent + failures reported by the QEMU binary itself. + """ + + +class MonitorResponseError(qmp.QMPError): + """ + Represents erroneous QMP monitor reply + """ + def __init__(self, reply): + try: + desc =3D reply["error"]["desc"] + except KeyError: + desc =3D reply + super(MonitorResponseError, self).__init__(desc) + self.reply =3D reply + + +class QEMUMachine(object): + """ + A QEMU VM + + Use this object as a context manager to ensure the QEMU process termin= ates:: + + with VM(binary) as vm: + ... + # vm is guaranteed to be shut down here + """ + + def __init__(self, binary, args=3DNone, wrapper=3DNone, name=3DNone, + test_dir=3D"/var/tmp", monitor_address=3DNone, + socket_scm_helper=3DNone): + ''' + 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-P= ID) + @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= () + @note: Qemu process is not started until launch() is used. + ''' + if args is None: + args =3D [] + if wrapper is None: + wrapper =3D [] + if name is None: + name =3D "qemu-%d" % os.getpid() + self._name =3D name + self._monitor_address =3D monitor_address + self._vm_monitor =3D None + self._qemu_log_path =3D None + self._qemu_log_file =3D None + self._popen =3D None + self._binary =3D binary + self._args =3D list(args) # Force copy args in case we modify = them + self._wrapper =3D wrapper + self._events =3D [] + self._iolog =3D None + self._socket_scm_helper =3D socket_scm_helper + self._qmp =3D None + self._qemu_full_args =3D None + self._test_dir =3D test_dir + self._temp_dir =3D None + self._launched =3D False + self._machine =3D None + self._console_set =3D False + self._console_device_type =3D None + self._console_address =3D None + self._console_socket =3D None + + # just in case logging wasn't configured by the main script: + logging.basicConfig() + + def __enter__(self): + return self + + def __exit__(self, exc_type, exc_val, exc_tb): + self.shutdown() + return False + + # This can be used to add an unused monitor instance. + def add_monitor_null(self): + self._args.append('-monitor') + self._args.append('null') + + def add_fd(self, fd, fdset, opaque, opts=3D''): + """ + Pass a file descriptor to the VM + """ + options =3D ['fd=3D%d' % fd, + 'set=3D%d' % fdset, + 'opaque=3D%s' % opaque] + if opts: + options.append(opts) + + # This did not exist before 3.4, but since then it is + # mandatory for our purpose + if hasattr(os, 'set_inheritable'): + os.set_inheritable(fd, True) + + self._args.append('-add-fd') + self._args.append(','.join(options)) + return self + + # Exactly one of fd and file_path must be given. + # (If it is file_path, the helper will open that file and pass its + # own fd) + def send_fd_scm(self, fd=3DNone, file_path=3DNone): + # In iotest.py, the qmp should always use unix socket. + assert self._qmp.is_scm_available() + if self._socket_scm_helper is None: + raise QEMUMachineError("No path to socket_scm_helper set") + if not os.path.exists(self._socket_scm_helper): + raise QEMUMachineError("%s does not exist" % + self._socket_scm_helper) + + # This did not exist before 3.4, but since then it is + # mandatory for our purpose + if hasattr(os, 'set_inheritable'): + os.set_inheritable(self._qmp.get_sock_fd(), True) + if fd is not None: + os.set_inheritable(fd, True) + + fd_param =3D ["%s" % self._socket_scm_helper, + "%d" % self._qmp.get_sock_fd()] + + if file_path is not None: + assert fd is None + fd_param.append(file_path) + else: + assert fd is not None + fd_param.append(str(fd)) + + devnull =3D open(os.path.devnull, 'rb') + proc =3D subprocess.Popen(fd_param, stdin=3Ddevnull, stdout=3Dsubp= rocess.PIPE, + stderr=3Dsubprocess.STDOUT, close_fds=3DFa= lse) + output =3D proc.communicate()[0] + if output: + LOG.debug(output) + + return proc.returncode + + @staticmethod + def _remove_if_exists(path): + """ + Remove file object at path if it exists + """ + try: + os.remove(path) + except OSError as exception: + if exception.errno =3D=3D errno.ENOENT: + return + raise + + def is_running(self): + return self._popen is not None and self._popen.poll() is None + + def exitcode(self): + if self._popen is None: + return None + return self._popen.poll() + + def get_pid(self): + if not self.is_running(): + return None + return self._popen.pid + + def _load_io_log(self): + if self._qemu_log_path is not None: + with open(self._qemu_log_path, "r") as iolog: + self._iolog =3D iolog.read() + + def _base_args(self): + if isinstance(self._monitor_address, tuple): + moncdev =3D "socket,id=3Dmon,host=3D%s,port=3D%s" % ( + self._monitor_address[0], + self._monitor_address[1]) + else: + moncdev =3D 'socket,id=3Dmon,path=3D%s' % self._vm_monitor + args =3D ['-chardev', moncdev, + '-mon', 'chardev=3Dmon,mode=3Dcontrol', + '-display', 'none', '-vga', 'none'] + if self._machine is not None: + args.extend(['-machine', self._machine]) + if self._console_set: + self._console_address =3D os.path.join(self._temp_dir, + self._name + "-console.so= ck") + chardev =3D ('socket,id=3Dconsole,path=3D%s,server,nowait' % + self._console_address) + args.extend(['-chardev', chardev]) + if self._console_device_type is None: + args.extend(['-serial', 'chardev:console']) + else: + device =3D '%s,chardev=3Dconsole' % self._console_device_t= ype + args.extend(['-device', device]) + return args + + def _pre_launch(self): + self._temp_dir =3D tempfile.mkdtemp(dir=3Dself._test_dir) + if self._monitor_address is not None: + self._vm_monitor =3D self._monitor_address + else: + self._vm_monitor =3D os.path.join(self._temp_dir, + self._name + "-monitor.sock") + self._qemu_log_path =3D os.path.join(self._temp_dir, self._name + = ".log") + self._qemu_log_file =3D open(self._qemu_log_path, 'wb') + + self._qmp =3D qmp.QEMUMonitorProtocol(self._vm_monitor, + server=3DTrue) + + def _post_launch(self): + self._qmp.accept() + + def _post_shutdown(self): + if self._qemu_log_file is not None: + self._qemu_log_file.close() + self._qemu_log_file =3D None + + self._qemu_log_path =3D None + + if self._console_socket is not None: + self._console_socket.close() + self._console_socket =3D None + + if self._temp_dir is not None: + shutil.rmtree(self._temp_dir) + self._temp_dir =3D None + + def launch(self): + """ + Launch the VM and make sure we cleanup and expose the + command line/output in case of exception + """ + + if self._launched: + raise QEMUMachineError('VM already launched') + + self._iolog =3D None + self._qemu_full_args =3D None + try: + self._launch() + self._launched =3D True + except: + self.shutdown() + + LOG.debug('Error launching VM') + if self._qemu_full_args: + LOG.debug('Command: %r', ' '.join(self._qemu_full_args)) + if self._iolog: + LOG.debug('Output: %r', self._iolog) + raise + + def _launch(self): + """ + Launch the VM and establish a QMP connection + """ + devnull =3D open(os.path.devnull, 'rb') + self._pre_launch() + self._qemu_full_args =3D (self._wrapper + [self._binary] + + self._base_args() + self._args) + LOG.debug('VM launch command: %r', ' '.join(self._qemu_full_args)) + self._popen =3D subprocess.Popen(self._qemu_full_args, + stdin=3Ddevnull, + stdout=3Dself._qemu_log_file, + stderr=3Dsubprocess.STDOUT, + shell=3DFalse, + close_fds=3DFalse) + self._post_launch() + + def wait(self): + """ + Wait for the VM to power off + """ + self._popen.wait() + self._qmp.close() + self._load_io_log() + self._post_shutdown() + + def shutdown(self): + """ + Terminate the VM and clean up + """ + if self.is_running(): + try: + self._qmp.cmd('quit') + self._qmp.close() + except: + self._popen.kill() + self._popen.wait() + + self._load_io_log() + self._post_shutdown() + + exitcode =3D self.exitcode() + if exitcode is not None and exitcode < 0: + msg =3D 'qemu received signal %i: %s' + if self._qemu_full_args: + command =3D ' '.join(self._qemu_full_args) + else: + command =3D '' + LOG.warn(msg, -exitcode, command) + + self._launched =3D False + + def qmp(self, cmd, conv_keys=3DTrue, **args): + """ + Invoke a QMP command and return the response dict + """ + qmp_args =3D dict() + for key, value in args.items(): + if conv_keys: + qmp_args[key.replace('_', '-')] =3D value + else: + qmp_args[key] =3D value + + return self._qmp.cmd(cmd, args=3Dqmp_args) + + def command(self, cmd, conv_keys=3DTrue, **args): + """ + Invoke a QMP command. + On success return the response dict. + On failure raise an exception. + """ + reply =3D self.qmp(cmd, conv_keys, **args) + if reply is None: + raise qmp.QMPError("Monitor is closed") + if "error" in reply: + raise MonitorResponseError(reply) + return reply["return"] + + def get_qmp_event(self, wait=3DFalse): + """ + Poll for one queued QMP events and return it + """ + if len(self._events) > 0: + return self._events.pop(0) + return self._qmp.pull_event(wait=3Dwait) + + def get_qmp_events(self, wait=3DFalse): + """ + Poll for queued QMP events and return a list of dicts + """ + events =3D self._qmp.get_events(wait=3Dwait) + events.extend(self._events) + del self._events[:] + self._qmp.clear_events() + return events + + @staticmethod + def event_match(event, match=3DNone): + """ + Check if an event matches optional match criteria. + + The match criteria takes the form of a matching subdict. The event= is + checked to be a superset of the subdict, recursively, with matching + values whenever the subdict values are not None. + + This has a limitation that you cannot explicitly check for None va= lues. + + Examples, with the subdict queries on the left: + - None matches any object. + - {"foo": None} matches {"foo": {"bar": 1}} + - {"foo": None} matches {"foo": 5} + - {"foo": {"abc": None}} does not match {"foo": {"bar": 1}} + - {"foo": {"rab": 2}} matches {"foo": {"bar": 1, "rab": 2}} + """ + if match is None: + return True + + try: + for key in match: + if key in event: + if not QEMUMachine.event_match(event[key], match[key]): + return False + else: + return False + return True + except TypeError: + # either match or event wasn't iterable (not a dict) + return match =3D=3D event + + def event_wait(self, name, timeout=3D60.0, match=3DNone): + """ + event_wait waits for and returns a named event from QMP with a tim= eout. + + name: The event to wait for. + timeout: QEMUMonitorProtocol.pull_event timeout parameter. + match: Optional match criteria. See event_match for details. + """ + return self.events_wait([(name, match)], timeout) + + def events_wait(self, events, timeout=3D60.0): + """ + events_wait waits for and returns a named event from QMP with a ti= meout. + + events: a sequence of (name, match_criteria) tuples. + The match criteria are optional and may be None. + See event_match for details. + timeout: QEMUMonitorProtocol.pull_event timeout parameter. + """ + def _match(event): + for name, match in events: + if (event['event'] =3D=3D name and + self.event_match(event, match)): + return True + return False + + # Search cached events + for event in self._events: + if _match(event): + self._events.remove(event) + return event + + # Poll for new events + while True: + event =3D self._qmp.pull_event(wait=3Dtimeout) + if _match(event): + return event + self._events.append(event) + + return None + + def get_log(self): + """ + After self.shutdown or failed qemu execution, this returns the out= put + of the qemu process. + """ + return self._iolog + + def add_args(self, *args): + """ + Adds to the list of extra arguments to be given to the QEMU binary + """ + self._args.extend(args) + + def set_machine(self, machine_type): + """ + Sets the machine type + + If set, the machine type will be added to the base arguments + of the resulting QEMU command line. + """ + self._machine =3D machine_type + + def set_console(self, device_type=3DNone): + """ + Sets the device type for a console device + + If set, the console device and a backing character device will + be added to the base arguments of the resulting QEMU command + line. + + This is a convenience method that will either use the provided + device type, or default to a "-serial chardev:console" command + line argument. + + The actual setting of command line arguments will be be done at + machine launch time, as it depends on the temporary directory + to be created. + + @param device_type: the device type, such as "isa-serial". If + None is given (the default value) a "-serial + chardev:console" command line argument will + be used instead, resorting to the machine's + default device type. + """ + self._console_set =3D True + self._console_device_type =3D device_type + + @property + def console_socket(self): + """ + Returns a socket connected to the console + """ + if self._console_socket is None: + self._console_socket =3D socket.socket(socket.AF_UNIX, + socket.SOCK_STREAM) + self._console_socket.connect(self._console_address) + return self._console_socket diff --git a/python/qemu/qtest.py b/python/qemu/qtest.py index eb45824dd0..eebcc233ed 100644 --- a/python/qemu/qtest.py +++ b/python/qemu/qtest.py @@ -14,7 +14,7 @@ import socket import os =20 -from . import QEMUMachine +from .machine import QEMUMachine =20 =20 class QEMUQtestProtocol(object): diff --git a/scripts/device-crash-test b/scripts/device-crash-test index a6748910ad..15f213a6cd 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -36,7 +36,7 @@ import argparse from itertools import chain =20 sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'python')) -from qemu import QEMUMachine +from qemu.machine import QEMUMachine =20 logger =3D logging.getLogger('device-crash-test') dbg =3D logger.debug diff --git a/scripts/render_block_graph.py b/scripts/render_block_graph.py index 3e9d282a49..656f0388ad 100755 --- a/scripts/render_block_graph.py +++ b/scripts/render_block_graph.py @@ -25,7 +25,7 @@ import json from graphviz import Digraph =20 sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'python')) -from qemu import MonitorResponseError +from qemu.machine import MonitorResponseError =20 =20 def perm(arr): diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index 2b236a1cf0..aee5d820ed 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -17,7 +17,7 @@ import avocado SRC_ROOT_DIR =3D os.path.join(os.path.dirname(__file__), '..', '..', '..') sys.path.append(os.path.join(SRC_ROOT_DIR, 'python')) =20 -from qemu import QEMUMachine +from qemu.machine import QEMUMachine =20 def is_readable_executable_file(path): return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK) diff --git a/tests/acceptance/virtio_version.py b/tests/acceptance/virtio_v= ersion.py index 8b97453ff8..33593c29dd 100644 --- a/tests/acceptance/virtio_version.py +++ b/tests/acceptance/virtio_version.py @@ -12,7 +12,7 @@ import sys import os =20 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'pytho= n')) -from qemu import QEMUMachine +from qemu.machine import QEMUMachine from avocado_qemu import Test =20 # Virtio Device IDs: diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestper= f/engine.py index 0e304660b8..f13dbea800 100644 --- a/tests/migration/guestperf/engine.py +++ b/tests/migration/guestperf/engine.py @@ -30,7 +30,7 @@ from guestperf.timings import TimingRecord, Timings =20 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', '..', 'python')) -import qemu +from qemu.machine import QEMUMachine =20 =20 class Engine(object): @@ -386,17 +386,17 @@ class Engine(object): dstmonaddr =3D "/var/tmp/qemu-dst-%d-monitor.sock" % os.getpid= () srcmonaddr =3D "/var/tmp/qemu-src-%d-monitor.sock" % os.getpid() =20 - src =3D qemu.QEMUMachine(self._binary, - args=3Dself._get_src_args(hardware), - wrapper=3Dself._get_src_wrapper(hardware), - name=3D"qemu-src-%d" % os.getpid(), - monitor_address=3Dsrcmonaddr) + src =3D QEMUMachine(self._binary, + args=3Dself._get_src_args(hardware), + wrapper=3Dself._get_src_wrapper(hardware), + name=3D"qemu-src-%d" % os.getpid(), + monitor_address=3Dsrcmonaddr) =20 - dst =3D qemu.QEMUMachine(self._binary, - args=3Dself._get_dst_args(hardware, uri), - wrapper=3Dself._get_dst_wrapper(hardware), - name=3D"qemu-dst-%d" % os.getpid(), - monitor_address=3Ddstmonaddr) + dst =3D QEMUMachine(self._binary, + args=3Dself._get_dst_args(hardware, uri), + wrapper=3Dself._get_dst_wrapper(hardware), + name=3D"qemu-dst-%d" % os.getpid(), + monitor_address=3Ddstmonaddr) =20 try: src.launch() diff --git a/tests/qemu-iotests/235 b/tests/qemu-iotests/235 index 2b6a8c13be..fedd111fd4 100755 --- a/tests/qemu-iotests/235 +++ b/tests/qemu-iotests/235 @@ -25,7 +25,7 @@ from iotests import qemu_img_create, qemu_io, file_path, = log =20 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'pytho= n')) =20 -from qemu import QEMUMachine +from qemu.machine import QEMUMachine =20 # Note: # This test was added to check that mirror dead-lock was fixed (see previo= us diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 0556bdcf9e..4b496f1551 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -18,7 +18,8 @@ import logging import time import datetime sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'pytho= n')) -from qemu import QEMUMachine, kvm_available +from qemu import kvm_available +from qemu.machine import QEMUMachine import subprocess import hashlib import optparse --=20 2.20.1 From nobody Mon Apr 29 20:20:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559076273; cv=none; d=zoho.com; s=zohoarc; b=kRuSJMdiks0Sjxqr0Lo4z0WtDdz9Xm3pTSUXP0hgMcLsqUNSk2wn9b6Mya5FBubnKTDsSVgsETTGDYZaLRVtpeGvnjDC4FpTf11VsrsyJoa3AxUcUuwfdF6dIvxkcubip0QXGTiOtJhu3CQQk8EOgVXSrdrmyQbArGP41LGIL1c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559076273; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Gf8b5fsc4z/1SKCjGd67DwrpA0D+eql92EgN0+dg6bk=; b=QVluTYNVyBEi0ZJJ1ZCSt7m7vkJ72iP0J0mcbkgRp+ufO2wD96mrKjtQAKi1MVccT4bNLgIcPSyInrUilTD47CNOFc2fchGVm6yb17Ws9kr0yqyjh1mxuL/amobuWF8FcEzjwW7IdZk/fp3s6Wox+98I1FJKaamW+nXSGMdAjo4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559076273638408.40504253518407; Tue, 28 May 2019 13:44:33 -0700 (PDT) Received: from localhost ([127.0.0.1]:42472 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hViwp-0006Ib-0C for importer@patchew.org; Tue, 28 May 2019 16:43:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVivV-0005g3-Tv for qemu-devel@nongnu.org; Tue, 28 May 2019 16:42:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVivU-0001C2-Ro for qemu-devel@nongnu.org; Tue, 28 May 2019 16:42:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64608) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVivU-0001AR-JL for qemu-devel@nongnu.org; Tue, 28 May 2019 16:42:28 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A879E3087926 for ; Tue, 28 May 2019 20:42:26 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-187.bos.redhat.com [10.18.17.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A82B10027C7; Tue, 28 May 2019 20:42:25 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Date: Tue, 28 May 2019 16:42:20 -0400 Message-Id: <20190528204220.9615-3-jsnow@redhat.com> In-Reply-To: <20190528204220.9615-1-jsnow@redhat.com> References: <20190528204220.9615-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 28 May 2019 20:42:26 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 2/2] machine.py: minor delinting X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Snow , ehabkost@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Since we're out in a new module, do a quick cursory pass of some of the more obvious style issues. Signed-off-by: John Snow --- python/qemu/machine.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/python/qemu/machine.py b/python/qemu/machine.py index a8a311b035..925046fc20 100644 --- a/python/qemu/machine.py +++ b/python/qemu/machine.py @@ -16,7 +16,6 @@ import errno import logging import os import subprocess -import re import shutil import socket import tempfile @@ -54,7 +53,7 @@ class MonitorResponseError(qmp.QMPError): self.reply =3D reply =20 =20 -class QEMUMachine(object): +class QEMUMachine: """ A QEMU VM =20 @@ -119,8 +118,10 @@ class QEMUMachine(object): self.shutdown() return False =20 - # This can be used to add an unused monitor instance. def add_monitor_null(self): + """ + This can be used to add an unused monitor instance. + """ self._args.append('-monitor') self._args.append('null') =20 @@ -143,10 +144,13 @@ class QEMUMachine(object): self._args.append(','.join(options)) return self =20 - # Exactly one of fd and file_path must be given. - # (If it is file_path, the helper will open that file and pass its - # own fd) def send_fd_scm(self, fd=3DNone, file_path=3DNone): + """ + Send an fd or file_path to socket_scm_helper. + + Exactly one of fd and file_path must be given. + If it is file_path, the helper will open that file and pass its ow= n fd. + """ # In iotest.py, the qmp should always use unix socket. assert self._qmp.is_scm_available() if self._socket_scm_helper is None: @@ -194,14 +198,17 @@ class QEMUMachine(object): raise =20 def is_running(self): + """Returns true if the VM is running.""" return self._popen is not None and self._popen.poll() is None =20 def exitcode(self): + """Returns the exit code if possible, or None.""" if self._popen is None: return None return self._popen.poll() =20 def get_pid(self): + """Returns the PID of the running process, or None.""" if not self.is_running(): return None return self._popen.pid @@ -339,7 +346,7 @@ class QEMUMachine(object): command =3D ' '.join(self._qemu_full_args) else: command =3D '' - LOG.warn(msg, -exitcode, command) + LOG.warning(msg, -exitcode, command) =20 self._launched =3D False =20 @@ -373,7 +380,7 @@ class QEMUMachine(object): """ Poll for one queued QMP events and return it """ - if len(self._events) > 0: + if self._events: return self._events.pop(0) return self._qmp.pull_event(wait=3Dwait) =20 --=20 2.20.1