aboutsummaryrefslogtreecommitdiff
path: root/tests/migration
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2019-06-27 17:28:14 -0400
committerEduardo Habkost <ehabkost@redhat.com>2019-07-01 19:02:10 -0300
commitabf0bf998dcb20807195018bfdd7abca2930dbbd (patch)
tree1e8edb1d32d794a2ca1ac2e43bdffa7777155c36 /tests/migration
parent08aa87f5e78270c3b225eb5c89c069aa9f49f5c1 (diff)
downloadqemu-abf0bf998dcb20807195018bfdd7abca2930dbbd.zip
qemu-abf0bf998dcb20807195018bfdd7abca2930dbbd.tar.gz
qemu-abf0bf998dcb20807195018bfdd7abca2930dbbd.tar.bz2
python/qemu: split QEMUMachine out from underneath __init__.py
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 <jsnow@redhat.com> Message-Id: <20190627212816.27298-2-jsnow@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'tests/migration')
-rw-r--r--tests/migration/guestperf/engine.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
index 0e30466..f13dbea 100644
--- a/tests/migration/guestperf/engine.py
+++ b/tests/migration/guestperf/engine.py
@@ -30,7 +30,7 @@ from guestperf.timings import TimingRecord, Timings
sys.path.append(os.path.join(os.path.dirname(__file__),
'..', '..', '..', 'python'))
-import qemu
+from qemu.machine import QEMUMachine
class Engine(object):
@@ -386,17 +386,17 @@ class Engine(object):
dstmonaddr = "/var/tmp/qemu-dst-%d-monitor.sock" % os.getpid()
srcmonaddr = "/var/tmp/qemu-src-%d-monitor.sock" % os.getpid()
- src = qemu.QEMUMachine(self._binary,
- args=self._get_src_args(hardware),
- wrapper=self._get_src_wrapper(hardware),
- name="qemu-src-%d" % os.getpid(),
- monitor_address=srcmonaddr)
-
- dst = qemu.QEMUMachine(self._binary,
- args=self._get_dst_args(hardware, uri),
- wrapper=self._get_dst_wrapper(hardware),
- name="qemu-dst-%d" % os.getpid(),
- monitor_address=dstmonaddr)
+ src = QEMUMachine(self._binary,
+ args=self._get_src_args(hardware),
+ wrapper=self._get_src_wrapper(hardware),
+ name="qemu-src-%d" % os.getpid(),
+ monitor_address=srcmonaddr)
+
+ dst = QEMUMachine(self._binary,
+ args=self._get_dst_args(hardware, uri),
+ wrapper=self._get_dst_wrapper(hardware),
+ name="qemu-dst-%d" % os.getpid(),
+ monitor_address=dstmonaddr)
try:
src.launch()