| Message ID | 20191206213433.11305-2-wainersm@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | python/qemu: New accel module and improvements | expand |
On Fri, Dec 06, 2019 at 04:34:30PM -0500, Wainer dos Santos Moschetta wrote: > This creates the 'accel' Python module to be the home for > utilities that deal with accelerators. Also moved kvm_available() > from __init__.py to this new module. > > Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com> > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > python/qemu/__init__.py | 20 +------------------- > python/qemu/accel.py | 31 +++++++++++++++++++++++++++++++ > tests/vm/basevm.py | 2 +- > 3 files changed, 33 insertions(+), 20 deletions(-) > create mode 100644 python/qemu/accel.py > > diff --git a/python/qemu/__init__.py b/python/qemu/__init__.py > index 6c919a3d56..eff17a306e 100644 > --- a/python/qemu/__init__.py > +++ b/python/qemu/__init__.py > @@ -12,24 +12,6 @@ > # Based on qmp.py. > # > > -import logging > -import os > - > from . import qmp > from . import machine These lines don't achieve anything besides forcing an earlier evaluation of those modules, which AFAICT is totally unnecessary. If there was code in QEMU such as: import qemu def foo(): ... raise qemu.qmp.QMPError Then there would be a reason for such imports. I couldn't find any though. Anyway, I now this is not from your patch but... > - > -LOG = logging.getLogger(__name__) > - > -# Mapping host architecture to any additional architectures it can > -# support which often includes its 32 bit cousin. > -ADDITIONAL_ARCHES = { > - "x86_64" : "i386", > - "aarch64" : "armhf" > -} > - > -def kvm_available(target_arch=None): > - host_arch = os.uname()[4] > - if target_arch and target_arch != host_arch: > - if target_arch != ADDITIONAL_ARCHES.get(host_arch): > - return False > - return os.access("/dev/kvm", os.R_OK | os.W_OK) > +from . import accel ... according to that reasoning, this should be ommited. IMO we could use another patch in this series removing those imports. > diff --git a/python/qemu/accel.py b/python/qemu/accel.py > new file mode 100644 > index 0000000000..cbeac10dd1 > --- /dev/null > +++ b/python/qemu/accel.py > @@ -0,0 +1,31 @@ > +""" > +QEMU accel module: > + > +This module provides utilities for discover and check the availability of > +accelerators. > +""" > +# Copyright (C) 2015-2016 Red Hat Inc. > +# Copyright (C) 2012 IBM Corp. > +# > +# Authors: > +# Fam Zheng <famz@redhat.com> > +# > +# This work is licensed under the terms of the GNU GPL, version 2. See > +# the COPYING file in the top-level directory. > +# > + > +import os > + > +# Mapping host architecture to any additional architectures it can > +# support which often includes its 32 bit cousin. > +ADDITIONAL_ARCHES = { > + "x86_64" : "i386", > + "aarch64" : "armhf" > +} > + > +def kvm_available(target_arch=None): > + host_arch = os.uname()[4] > + if target_arch and target_arch != host_arch: > + if target_arch != ADDITIONAL_ARCHES.get(host_arch): > + return False > + return os.access("/dev/kvm", os.R_OK | os.W_OK) > diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py > index 91a9226026..3e2b69c96c 100755 > --- a/tests/vm/basevm.py > +++ b/tests/vm/basevm.py > @@ -21,7 +21,7 @@ import logging > import time > import datetime > sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) > -from qemu import kvm_available > +from qemu.accel import kvm_available > from qemu.machine import QEMUMachine > import subprocess > import hashlib > -- > 2.21.0 > Other than that, this LGTM. - Cleber.
diff --git a/python/qemu/__init__.py b/python/qemu/__init__.py index 6c919a3d56..eff17a306e 100644 --- a/python/qemu/__init__.py +++ b/python/qemu/__init__.py @@ -12,24 +12,6 @@ # Based on qmp.py. # -import logging -import os - from . import qmp from . import machine - -LOG = logging.getLogger(__name__) - -# Mapping host architecture to any additional architectures it can -# support which often includes its 32 bit cousin. -ADDITIONAL_ARCHES = { - "x86_64" : "i386", - "aarch64" : "armhf" -} - -def kvm_available(target_arch=None): - host_arch = os.uname()[4] - if target_arch and target_arch != host_arch: - if target_arch != ADDITIONAL_ARCHES.get(host_arch): - return False - return os.access("/dev/kvm", os.R_OK | os.W_OK) +from . import accel diff --git a/python/qemu/accel.py b/python/qemu/accel.py new file mode 100644 index 0000000000..cbeac10dd1 --- /dev/null +++ b/python/qemu/accel.py @@ -0,0 +1,31 @@ +""" +QEMU accel module: + +This module provides utilities for discover and check the availability of +accelerators. +""" +# Copyright (C) 2015-2016 Red Hat Inc. +# Copyright (C) 2012 IBM Corp. +# +# Authors: +# Fam Zheng <famz@redhat.com> +# +# This work is licensed under the terms of the GNU GPL, version 2. See +# the COPYING file in the top-level directory. +# + +import os + +# Mapping host architecture to any additional architectures it can +# support which often includes its 32 bit cousin. +ADDITIONAL_ARCHES = { + "x86_64" : "i386", + "aarch64" : "armhf" +} + +def kvm_available(target_arch=None): + host_arch = os.uname()[4] + if target_arch and target_arch != host_arch: + if target_arch != ADDITIONAL_ARCHES.get(host_arch): + return False + return os.access("/dev/kvm", os.R_OK | os.W_OK) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 91a9226026..3e2b69c96c 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -21,7 +21,7 @@ import logging import time import datetime sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) -from qemu import kvm_available +from qemu.accel import kvm_available from qemu.machine import QEMUMachine import subprocess import hashlib