Skip to contentSkip to conversation

qemurunner.py: Support fallback to older QEMU qmp library

PATCH New Mark Hatle 1 participant 1 message Nov 21, 2022

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

PATCH 1/1 qemurunner.py: Support fallback to older QEMU qmp library

From: Mark Hatle <[email protected]>

Some vendor versions of QEMU may be on older versions that do not have qmp.legacy, but instead of qmp. Default to the integrated library versions, fall back to the older one and then if neither is available catch the exception and provide a more human readable error.

---
 meta/lib/oeqa/utils/qemurunner.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
meta/lib/oeqa/utils/qemurunner.py +7 -1
index f175f8a1de..436caef273 100644
@@ -328,8 +328,14 @@ class QemuRunner:
         try:
             os.chdir(os.path.dirname(qmp_port))
             try:
-               from qmp.legacy import QEMUMonitorProtocol
+               try:
+                   from qmp.legacy import QEMUMonitorProtocol
+               except ModuleNotFoundError:
+                   from qmp import QEMUMonitorProtocol
                self.qmp = QEMUMonitorProtocol(os.path.basename(qmp_port))
+            except ModuleNotFoundError as msg:
+                self.logger.warning("Failed to load QEMUMonitorProtocol from qmp.legacy or qmp: %s" % (msg))
+                return False
             except OSError as msg:
                 self.logger.warning("Failed to initialize qemu monitor socket: %s File: %s" % (msg, msg.filename))
                 return False
Signature · 1 line
2.25.1