On Thu, Feb 11, 2021 at 01:58:36PM -0500, John Snow wrote: > Create a space for miscellaneous things that don't belong strictly in > "qemu.machine" nor "qemu.qmp" packages. > > Signed-off-by: John Snow <js...@redhat.com> > --- > python/qemu/machine/__init__.py | 8 -------- > python/qemu/utils/__init__.py | 23 +++++++++++++++++++++++ > python/qemu/{machine => utils}/accel.py | 0 > tests/acceptance/boot_linux.py | 2 +- > tests/acceptance/virtio-gpu.py | 2 +- > tests/acceptance/virtiofs_submounts.py | 2 +- > tests/vm/aarch64vm.py | 2 +- > tests/vm/basevm.py | 3 ++- > 8 files changed, 29 insertions(+), 13 deletions(-) > create mode 100644 python/qemu/utils/__init__.py > rename python/qemu/{machine => utils}/accel.py (100%) > > diff --git a/python/qemu/machine/__init__.py b/python/qemu/machine/__init__.py > index 27b0b19abd3..891a8f784b5 100644 > --- a/python/qemu/machine/__init__.py > +++ b/python/qemu/machine/__init__.py > @@ -8,10 +8,6 @@ > - QEMUQtestMachine: VM class, with a qtest socket. > > - QEMUQtestProtocol: Connect to, send/receive qtest messages. > - > -- list_accel: List available accelerators > -- kvm_available: Probe for KVM support > -- tcg_available: Probe for TCG support > """ > > # Copyright (C) 2020 John Snow for Red Hat Inc. > @@ -26,15 +22,11 @@ > # the COPYING file in the top-level directory. > # > > -from .accel import kvm_available, list_accel, tcg_available > from .machine import QEMUMachine > from .qtest import QEMUQtestMachine, QEMUQtestProtocol > > > __all__ = ( > - 'list_accel', > - 'kvm_available', > - 'tcg_available', > 'QEMUMachine', > 'QEMUQtestProtocol', > 'QEMUQtestMachine', > diff --git a/python/qemu/utils/__init__.py b/python/qemu/utils/__init__.py > new file mode 100644 > index 00000000000..edf807a93e5 > --- /dev/null > +++ b/python/qemu/utils/__init__.py > @@ -0,0 +1,23 @@ > +""" > +QEMU development and testing utilities > + > +This library provides a small handful of utilities for performing various > tasks > +not directly related to the launching of a VM. > + > +The only module included at present is accel; its public functions are > +repeated here for your convenience: > + > +- list_accel: List available accelerators > +- kvm_available: Probe for KVM support > +- tcg_available: Prove for TCG support > +""" > + > +# pylint: disable=import-error > +from .accel import kvm_available, list_accel, tcg_available > + > + > +__all__ = ( > + 'list_accel', > + 'kvm_available', > + 'tcg_available', > +) > diff --git a/python/qemu/machine/accel.py b/python/qemu/utils/accel.py > similarity index 100% > rename from python/qemu/machine/accel.py > rename to python/qemu/utils/accel.py > diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py > index 212365fd185..824cf03d5f4 100644 > --- a/tests/acceptance/boot_linux.py > +++ b/tests/acceptance/boot_linux.py > @@ -12,7 +12,7 @@ > > from avocado_qemu import Test, BUILD_DIR > > -from qemu.machine import kvm_available, tcg_available > +from qemu.utils import kvm_available, tcg_available >
With the latest changes merged earlier Today, this won't be necessary anymore on boot_linux.py, but the equivalent change will be necessary on tests/acceptance/avocado_qemu/__init__.py. With the change mentioned above (which you would catch on a rebase): Reviewed-by: Cleber Rosa <cr...@redhat.com> Tested-by: Cleber Rosa <cr...@redhat.com>
signature.asc
Description: PGP signature