summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 4c3d2010fb..07018b7de8 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -188,8 +188,8 @@ class QemuRunner:
188 importlib.invalidate_caches() 188 importlib.invalidate_caches()
189 try: 189 try:
190 qmp = importlib.import_module("qmp") 190 qmp = importlib.import_module("qmp")
191 except: 191 except Exception as e:
192 self.logger.error("qemurunner: qmp.py missing, please ensure it's installed") 192 self.logger.error("qemurunner: qmp.py missing, please ensure it's installed (%s)" % str(e))
193 return False 193 return False
194 # Path relative to tmpdir used as cwd for qemu below to avoid unix socket path length issues 194 # Path relative to tmpdir used as cwd for qemu below to avoid unix socket path length issues
195 qmp_file = "." + next(tempfile._get_candidate_names()) 195 qmp_file = "." + next(tempfile._get_candidate_names())
@@ -325,7 +325,8 @@ class QemuRunner:
325 try: 325 try:
326 os.chdir(os.path.dirname(qmp_port)) 326 os.chdir(os.path.dirname(qmp_port))
327 try: 327 try:
328 self.qmp = qmp.QEMUMonitorProtocol(os.path.basename(qmp_port)) 328 from qmp.legacy import QEMUMonitorProtocol
329 self.qmp = QEMUMonitorProtocol(os.path.basename(qmp_port))
329 except OSError as msg: 330 except OSError as msg:
330 self.logger.warning("Failed to initialize qemu monitor socket: %s File: %s" % (msg, msg.filename)) 331 self.logger.warning("Failed to initialize qemu monitor socket: %s File: %s" % (msg, msg.filename))
331 return False 332 return False