diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-04 11:40:50 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-04 11:40:50 +0100 |
| commit | 3eb98f760e54f897a7ecf88e63f9eade6b00f614 (patch) | |
| tree | d5d775e5a2f07dffc52c716db75d0e609e642269 /tests/vm/basevm.py | |
| parent | aff8cee805e5b3c2b6e38ddb85448818a19a48db (diff) | |
| parent | e5abf59eae5990296c243202f95f801495c52e76 (diff) | |
Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging
Python queue, 2019-07-01
* Deprecate Python 2 support (Eduardo Habkost)
* qemu/__init__.py refactor (John Snow)
* make qmp-shell work with python3 (Igor Mammedov)
# gpg: Signature made Mon 01 Jul 2019 23:28:27 BST
# gpg: using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg: issuer "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/python-next-pull-request:
Deprecate Python 2 support
machine.py: minor delinting
python/qemu: split QEMUMachine out from underneath __init__.py
qmp: make qmp-shell work with python3
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/vm/basevm.py')
| -rwxr-xr-x | tests/vm/basevm.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 4847549592..64067c1075 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -18,7 +18,8 @@ import logging import time import datetime sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) -from qemu import QEMUMachine, kvm_available +from qemu import kvm_available +from qemu.machine import QEMUMachine import subprocess import hashlib import optparse |