| Message ID | 20210512231241.2816122-4-jsnow@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | python: create installable package | expand |
On Wed, May 12, 2021 at 07:12:19PM -0400, 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 <jsnow@redhat.com> > --- > python/qemu/machine/__init__.py | 8 -------- > python/qemu/utils/__init__.py | 23 +++++++++++++++++++++++ > python/qemu/{machine => utils}/accel.py | 0 > tests/acceptance/avocado_qemu/__init__.py | 4 ++-- > tests/acceptance/virtio-gpu.py | 2 +- > tests/vm/aarch64vm.py | 2 +- > tests/vm/basevm.py | 3 ++- > 7 files changed, 29 insertions(+), 13 deletions(-) > create mode 100644 python/qemu/utils/__init__.py > rename python/qemu/{machine => utils}/accel.py (100%) > As you mentioned in the previous patch notes, I would not mind a squash here. Either way: Reviewed-by: Cleber Rosa <crosa@redhat.com> Tested-by: Cleber Rosa <crosa@redhat.com>
On 5/18/21 11:12 AM, Cleber Rosa wrote: > As you mentioned in the previous patch notes, I would not mind a > squash here. Either way: > > Reviewed-by: Cleber Rosa<crosa@redhat.com> > Tested-by: Cleber Rosa<crosa@redhat.com> I will definitely do so, then. :) Thanks for the reviews thus far! --js
On Wed, May 12, 2021 at 8:13 PM John Snow <jsnow@redhat.com> wrote: > > Create a space for miscellaneous things that don't belong strictly in > "qemu.machine" nor "qemu.qmp" packages. > > Signed-off-by: John Snow <jsnow@redhat.com> > --- > python/qemu/machine/__init__.py | 8 -------- > python/qemu/utils/__init__.py | 23 +++++++++++++++++++++++ > python/qemu/{machine => utils}/accel.py | 0 > tests/acceptance/avocado_qemu/__init__.py | 4 ++-- > tests/acceptance/virtio-gpu.py | 2 +- > tests/vm/aarch64vm.py | 2 +- > tests/vm/basevm.py | 3 ++- > 7 files changed, 29 insertions(+), 13 deletions(-) > create mode 100644 python/qemu/utils/__init__.py > rename python/qemu/{machine => utils}/accel.py (100%) > Reviewed-by: Willian Rampazzo <willianr@redhat.com>
On 5/21/21 1:18 PM, Willian Rampazzo wrote: > On Wed, May 12, 2021 at 8:13 PM John Snow <jsnow@redhat.com> wrote: >> >> Create a space for miscellaneous things that don't belong strictly in >> "qemu.machine" nor "qemu.qmp" packages. >> >> Signed-off-by: John Snow <jsnow@redhat.com> >> --- >> python/qemu/machine/__init__.py | 8 -------- >> python/qemu/utils/__init__.py | 23 +++++++++++++++++++++++ >> python/qemu/{machine => utils}/accel.py | 0 >> tests/acceptance/avocado_qemu/__init__.py | 4 ++-- >> tests/acceptance/virtio-gpu.py | 2 +- >> tests/vm/aarch64vm.py | 2 +- >> tests/vm/basevm.py | 3 ++- >> 7 files changed, 29 insertions(+), 13 deletions(-) >> create mode 100644 python/qemu/utils/__init__.py >> rename python/qemu/{machine => utils}/accel.py (100%) >> > > Reviewed-by: Willian Rampazzo <willianr@redhat.com> > Thanks :) I've since squashed patches 2/3, so I will add your R-B to that combined patch. --js
diff --git a/python/qemu/machine/__init__.py b/python/qemu/machine/__init__.py index 0ac6c1e36e3..98302ea31e7 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-2021 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/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index ff7bf81f1a9..5f60892c2c4 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -41,8 +41,8 @@ sys.path.append(os.path.join(SOURCE_DIR, 'python')) from qemu.machine import QEMUMachine -from qemu.machine import kvm_available -from qemu.machine import tcg_available +from qemu.utils import kvm_available +from qemu.utils import tcg_available 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-gpu.py b/tests/acceptance/virtio-gpu.py index 0685e30bcae..e7979343e93 100644 --- a/tests/acceptance/virtio-gpu.py +++ b/tests/acceptance/virtio-gpu.py @@ -10,7 +10,7 @@ from avocado_qemu import exec_command_and_wait_for_pattern from avocado_qemu import is_readable_executable_file -from qemu.machine import kvm_available +from qemu.utils import kvm_available import os import socket diff --git a/tests/vm/aarch64vm.py b/tests/vm/aarch64vm.py index 39ff99b0859..b00cce07eb8 100644 --- a/tests/vm/aarch64vm.py +++ b/tests/vm/aarch64vm.py @@ -14,7 +14,7 @@ import sys import subprocess import basevm -from qemu.machine import kvm_available +from qemu.utils import kvm_available # This is the config needed for current version of QEMU. # This works for both kvm and tcg. diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 12d08cf2b1b..a3867fdf88e 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -19,7 +19,8 @@ import time import datetime sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) -from qemu.machine import kvm_available, QEMUMachine +from qemu.machine import QEMUMachine +from qemu.utils import kvm_available import subprocess import hashlib import argparse
Create a space for miscellaneous things that don't belong strictly in "qemu.machine" nor "qemu.qmp" packages. Signed-off-by: John Snow <jsnow@redhat.com> --- python/qemu/machine/__init__.py | 8 -------- python/qemu/utils/__init__.py | 23 +++++++++++++++++++++++ python/qemu/{machine => utils}/accel.py | 0 tests/acceptance/avocado_qemu/__init__.py | 4 ++-- tests/acceptance/virtio-gpu.py | 2 +- tests/vm/aarch64vm.py | 2 +- tests/vm/basevm.py | 3 ++- 7 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 python/qemu/utils/__init__.py rename python/qemu/{machine => utils}/accel.py (100%)