[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 7/7] python, iotests: replace qmp with aqmp
From: |
John Snow |
Subject: |
[PATCH v3 7/7] python, iotests: replace qmp with aqmp |
Date: |
Tue, 12 Oct 2021 18:34:45 -0400 |
Swap out the synchronous QEMUMonitorProtocol from qemu.qmp with the sync
wrapper from qemu.aqmp instead.
Add an escape hatch in the form of the environment variable
QEMU_PYTHON_LEGACY_QMP which allows you to cajole QEMUMachine into using
the old implementatin, proving that both implementations work
concurrently.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Tested-by: Hanna Reitz <hreitz@redhat.com>
---
python/qemu/machine/machine.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
index a0cf69786b4..a487c397459 100644
--- a/python/qemu/machine/machine.py
+++ b/python/qemu/machine/machine.py
@@ -41,7 +41,6 @@
)
from qemu.qmp import ( # pylint: disable=import-error
- QEMUMonitorProtocol,
QMPMessage,
QMPReturnValue,
SocketAddrT,
@@ -50,6 +49,12 @@
from . import console_socket
+if os.environ.get('QEMU_PYTHON_LEGACY_QMP'):
+ from qemu.qmp import QEMUMonitorProtocol
+else:
+ from qemu.aqmp.legacy import QEMUMonitorProtocol
+
+
LOG = logging.getLogger(__name__)
--
2.31.1
- [PATCH v3 0/7] Switch iotests to using Async QMP, John Snow, 2021/10/12
- [PATCH v3 1/7] python/machine: remove has_quit argument, John Snow, 2021/10/12
- [PATCH v3 2/7] python/machine: Handle QMP errors on close more meticulously, John Snow, 2021/10/12
- [PATCH v3 4/7] iotests: Accommodate async QMP Exception classes, John Snow, 2021/10/12
- [PATCH v3 3/7] python/aqmp: Remove scary message, John Snow, 2021/10/12
- [PATCH v3 5/7] iotests: Conditionally silence certain AQMP errors, John Snow, 2021/10/12
- [PATCH v3 7/7] python, iotests: replace qmp with aqmp,
John Snow <=
- [PATCH v3 6/7] python/aqmp: Create sync QMP wrapper for iotests, John Snow, 2021/10/12
- Re: [PATCH v3 0/7] Switch iotests to using Async QMP, Hanna Reitz, 2021/10/13