[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 12/16] python/machine.py: Add _qmp access shim
From: |
John Snow |
Subject: |
[PATCH v5 12/16] python/machine.py: Add _qmp access shim |
Date: |
Fri, 10 Jul 2020 01:22:16 -0400 |
Like many other Optional[] types, it's not always a given that this
object will be set. Wrap it in a type-shim that raises a meaningful
error and will always return a concrete type.
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/machine.py | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/python/qemu/machine.py b/python/qemu/machine.py
index 0df94c3211..9760a2badb 100644
--- a/python/qemu/machine.py
+++ b/python/qemu/machine.py
@@ -124,7 +124,7 @@ def __init__(self, binary, args=None, wrapper=None,
name=None,
self._events = []
self._iolog = None
self._qmp_set = True # Enable QMP monitor by default.
- self._qmp = None
+ self._qmp_connection: Optional[qmp.QEMUMonitorProtocol] = None
self._qemu_full_args = None
self._temp_dir = None
self._launched = False
@@ -291,14 +291,14 @@ def _pre_launch(self):
if self._remove_monitor_sockfile:
assert isinstance(self._monitor_address, str)
self._remove_files.append(self._monitor_address)
- self._qmp = qmp.QEMUMonitorProtocol(
+ self._qmp_connection = qmp.QEMUMonitorProtocol(
self._monitor_address,
server=True,
nickname=self._name
)
def _post_launch(self):
- if self._qmp:
+ if self._qmp_connection:
self._qmp.accept()
def _post_shutdown(self):
@@ -309,9 +309,9 @@ def _post_shutdown(self):
# Comprehensive reset for the failed launch case:
self._early_cleanup()
- if self._qmp:
+ if self._qmp_connection:
self._qmp.close()
- self._qmp = None
+ self._qmp_connection = None
self._load_io_log()
@@ -423,7 +423,7 @@ def _soft_shutdown(self, has_quit: bool = False,
"""
self._early_cleanup()
- if self._qmp is not None:
+ if self._qmp_connection:
if not has_quit:
# Might raise ConnectionReset
self._qmp.cmd('quit')
@@ -501,11 +501,13 @@ def set_qmp_monitor(self, enabled=True):
line. Default is True.
@note: call this function before launch().
"""
- if enabled:
- self._qmp_set = True
- else:
- self._qmp_set = False
- self._qmp = None
+ self._qmp_set = enabled
+
+ @property
+ def _qmp(self) -> qmp.QEMUMonitorProtocol:
+ if self._qmp_connection is None:
+ raise QEMUMachineError("Attempt to access QMP with no connection")
+ return self._qmp_connection
@classmethod
def _qmp_args(cls, _conv_keys: bool = True, **args: Any) -> Dict[str, Any]:
--
2.21.3
- [PATCH v5 01/16] python/qmp.py: Define common types, (continued)
- [PATCH v5 01/16] python/qmp.py: Define common types, John Snow, 2020/07/10
- [PATCH v5 02/16] iotests.py: use qemu.qmp type aliases, John Snow, 2020/07/10
- [PATCH v5 03/16] python/qmp.py: re-absorb MonitorResponseError, John Snow, 2020/07/10
- [PATCH v5 04/16] python/qmp.py: Do not return None from cmd_obj, John Snow, 2020/07/10
- [PATCH v5 05/16] python/qmp.py: add casts to JSON deserialization, John Snow, 2020/07/10
- [PATCH v5 06/16] python/qmp.py: add QMPProtocolError, John Snow, 2020/07/10
- [PATCH v5 09/16] python/machine.py: Don't modify state in _base_args(), John Snow, 2020/07/10
- [PATCH v5 07/16] python/machine.py: Fix monitor address typing, John Snow, 2020/07/10
- [PATCH v5 08/16] python/machine.py: reorder __init__, John Snow, 2020/07/10
- [PATCH v5 10/16] python/machine.py: Handle None events in events_wait, John Snow, 2020/07/10
- [PATCH v5 12/16] python/machine.py: Add _qmp access shim,
John Snow <=
- [PATCH v5 13/16] python/machine.py: fix _popen access, John Snow, 2020/07/10
- [PATCH v5 11/16] python/machine.py: use qmp.command, John Snow, 2020/07/10
- [PATCH v5 15/16] iotests.py: Adjust HMP kwargs typing, John Snow, 2020/07/10
- [PATCH v5 14/16] python/qemu: make 'args' style arguments immutable, John Snow, 2020/07/10
- [PATCH v5 16/16] python/qemu: Add mypy type annotations, John Snow, 2020/07/10
- Re: [PATCH v5 00/16] python: add mypy support to python/qemu, Philippe Mathieu-Daudé, 2020/07/14