From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
qemu-block@nongnu.org, John Snow <jsnow@redhat.com>,
Max Reitz <mreitz@redhat.com>, Cleber Rosa <crosa@redhat.com>,
philmd@redhat.com
Subject: [PATCH v2 12/16] python/machine.py: Add _qmp access shim
Date: Tue, 2 Jun 2020 17:45:24 -0400 [thread overview]
Message-ID: <20200602214528.12107-13-jsnow@redhat.com> (raw)
In-Reply-To: <20200602214528.12107-1-jsnow@redhat.com>
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 | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/python/qemu/machine.py b/python/qemu/machine.py
index 5add7a28eaf..9c45bdfb1e4 100644
--- a/python/qemu/machine.py
+++ b/python/qemu/machine.py
@@ -117,7 +117,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
@@ -283,7 +283,7 @@ 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
@@ -450,7 +450,13 @@ def set_qmp_monitor(self, enabled=True):
self._qmp_set = True
else:
self._qmp_set = False
- self._qmp = None
+ self._qmp_connection = None
+
+ @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
next prev parent reply other threads:[~2020-06-02 21:56 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-02 21:45 [PATCH v2 00/16] python: add mypy support to python/qemu John Snow
2020-06-02 21:45 ` [PATCH v2 01/16] python/qmp.py: Define common types John Snow
2020-06-02 21:45 ` [PATCH v2 02/16] iotests.py: use qemu.qmp type aliases John Snow
2020-06-02 21:45 ` [PATCH v2 03/16] python/qmp.py: re-absorb MonitorResponseError John Snow
2020-06-02 21:45 ` [PATCH v2 04/16] python/qmp.py: Do not return None from cmd_obj John Snow
2020-06-02 21:45 ` [PATCH v2 05/16] python/qmp.py: add casts to JSON deserialization John Snow
2020-06-04 13:49 ` Kevin Wolf
2020-06-04 18:33 ` John Snow
2020-06-02 21:45 ` [PATCH v2 06/16] python/qmp.py: add QMPProtocolError John Snow
2020-06-02 21:45 ` [PATCH v2 07/16] python/machine.py: Fix monitor address typing John Snow
2020-06-02 21:45 ` [PATCH v2 08/16] python/machine.py: reorder __init__ John Snow
2020-06-02 21:45 ` [PATCH v2 09/16] python/machine.py: Don't modify state in _base_args() John Snow
2020-06-02 21:45 ` [PATCH v2 10/16] python/machine.py: Handle None events in event_wait John Snow
2020-06-04 14:20 ` Kevin Wolf
2020-06-04 18:48 ` John Snow
2020-06-02 21:45 ` [PATCH v2 11/16] python/machine.py: use qmp.command John Snow
2020-06-02 21:45 ` John Snow [this message]
2020-06-02 21:45 ` [PATCH v2 13/16] python/machine.py: fix _popen access John Snow
2020-06-02 21:45 ` [PATCH v2 14/16] python/qemu: make 'args' style arguments immutable John Snow
2020-06-02 21:45 ` [PATCH v2 15/16] iotests.py: Adjust HMP kwargs typing John Snow
2020-06-02 21:45 ` [PATCH v2 16/16] python/qemu: Add mypy type annotations John Snow
2020-06-04 14:50 ` Kevin Wolf
2020-06-04 18:53 ` John Snow
2020-06-02 21:51 ` [PATCH v2 00/16] python: add mypy support to python/qemu Eric Blake
2020-06-02 22:31 ` John Snow
2020-06-03 8:24 ` Vladimir Sementsov-Ogievskiy
2020-06-03 14:15 ` John Snow
2020-06-04 14:51 ` Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200602214528.12107-13-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).