Skip to content

Commit

Permalink
python/qemu: delint; add flake8 config
Browse files Browse the repository at this point in the history
Mostly, ignore the "no bare except" rule, because flake8 is not
contextual and cannot determine if we re-raise. Pylint can, though, so
always prefer pylint for that.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200528222129.23826-5-jsnow@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
  • Loading branch information
jnsnow authored and philmd committed May 31, 2020
1 parent 9b8ccd6 commit 8dfac2e
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 9 deletions.
2 changes: 2 additions & 0 deletions python/qemu/.flake8
@@ -0,0 +1,2 @@
[flake8]
extend-ignore = E722 # Pylint handles this, but smarter.
9 changes: 6 additions & 3 deletions python/qemu/accel.py
Expand Up @@ -23,11 +23,12 @@
# Mapping host architecture to any additional architectures it can
# support which often includes its 32 bit cousin.
ADDITIONAL_ARCHES = {
"x86_64" : "i386",
"aarch64" : "armhf",
"ppc64le" : "ppc64",
"x86_64": "i386",
"aarch64": "armhf",
"ppc64le": "ppc64",
}


def list_accel(qemu_bin):
"""
List accelerators enabled in the QEMU binary.
Expand All @@ -47,6 +48,7 @@ def list_accel(qemu_bin):
# Skip the first line which is the header.
return [acc.strip() for acc in out.splitlines()[1:]]


def kvm_available(target_arch=None, qemu_bin=None):
"""
Check if KVM is available using the following heuristic:
Expand All @@ -69,6 +71,7 @@ def kvm_available(target_arch=None, qemu_bin=None):
return False
return True


def tcg_available(qemu_bin):
"""
Check if TCG is available.
Expand Down
13 changes: 9 additions & 4 deletions python/qemu/machine.py
Expand Up @@ -29,6 +29,7 @@

LOG = logging.getLogger(__name__)


class QEMUMachineError(Exception):
"""
Exception called when an error in QEMUMachine happens.
Expand Down Expand Up @@ -62,7 +63,8 @@ class QEMUMachine:
"""
A QEMU VM
Use this object as a context manager to ensure the QEMU process terminates::
Use this object as a context manager to ensure
the QEMU process terminates::
with VM(binary) as vm:
...
Expand Down Expand Up @@ -185,8 +187,10 @@ def send_fd_scm(self, fd=None, file_path=None):
fd_param.append(str(fd))

devnull = open(os.path.devnull, 'rb')
proc = subprocess.Popen(fd_param, stdin=devnull, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, close_fds=False)
proc = subprocess.Popen(
fd_param, stdin=devnull, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, close_fds=False
)
output = proc.communicate()[0]
if output:
LOG.debug(output)
Expand Down Expand Up @@ -485,7 +489,8 @@ def event_wait(self, name, timeout=60.0, match=None):

def events_wait(self, events, timeout=60.0):
"""
events_wait waits for and returns a named event from QMP with a timeout.
events_wait waits for and returns a named event
from QMP with a timeout.
events: a sequence of (name, match_criteria) tuples.
The match criteria are optional and may be None.
Expand Down
4 changes: 2 additions & 2 deletions python/qemu/qmp.py
Expand Up @@ -168,8 +168,8 @@ def accept(self, timeout=15.0):
@param timeout: timeout in seconds (nonnegative float number, or
None). The value passed will set the behavior of the
underneath QMP socket as described in [1]. Default value
is set to 15.0.
underneath QMP socket as described in [1].
Default value is set to 15.0.
@return QMP greeting dict
@raise OSError on socket connection errors
@raise QMPConnectError if the greeting is not received
Expand Down

0 comments on commit 8dfac2e

Please sign in to comment.