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 13/16] python/machine.py: fix _popen access
Date: Tue, 2 Jun 2020 17:45:25 -0400 [thread overview]
Message-ID: <20200602214528.12107-14-jsnow@redhat.com> (raw)
In-Reply-To: <20200602214528.12107-1-jsnow@redhat.com>
As always, Optional[T] causes problems with unchecked access. Add a
helper that asserts the pipe is present before we attempt to talk with
it.
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/machine.py | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/python/qemu/machine.py b/python/qemu/machine.py
index 9c45bdfb1e4..64197fc8492 100644
--- a/python/qemu/machine.py
+++ b/python/qemu/machine.py
@@ -113,7 +113,7 @@ def __init__(self, binary, args=None, wrapper=None, name=None,
# Runstate
self._qemu_log_path = None
self._qemu_log_file = None
- self._popen = None
+ self._popen: Optional['subprocess.Popen[bytes]'] = None
self._events = []
self._iolog = None
self._qmp_set = True # Enable QMP monitor by default.
@@ -225,6 +225,12 @@ def is_running(self):
"""Returns true if the VM is running."""
return self._popen is not None and self._popen.poll() is None
+ @property
+ def _subp(self) -> 'subprocess.Popen[bytes]':
+ if self._popen is None:
+ raise QEMUMachineError('Subprocess pipe not present')
+ return self._popen
+
def exitcode(self):
"""Returns the exit code if possible, or None."""
if self._popen is None:
@@ -235,7 +241,7 @@ def get_pid(self):
"""Returns the PID of the running process, or None."""
if not self.is_running():
return None
- return self._popen.pid
+ return self._subp.pid
def _load_io_log(self):
if self._qemu_log_path is not None:
@@ -365,7 +371,7 @@ def wait(self):
"""
Wait for the VM to power off
"""
- self._popen.wait()
+ self._subp.wait()
if self._qmp:
self._qmp.close()
self._post_shutdown()
@@ -377,8 +383,8 @@ def _hard_shutdown(self) -> None:
if not self.is_running():
return
- self._popen.kill()
- self._popen.wait(timeout=60)
+ self._subp.kill()
+ self._subp.wait(timeout=60)
def _soft_shutdown(self, has_quit: bool = False, timeout: int = 3) -> None:
"""
@@ -395,7 +401,7 @@ def _soft_shutdown(self, has_quit: bool = False, timeout: int = 3) -> None:
self._qmp.cmd('quit')
self._qmp.close()
- self._popen.wait(timeout=timeout)
+ self._subp.wait(timeout=timeout)
def _do_shutdown(self, has_quit: bool = False, timeout: int = 3) -> None:
"""
--
2.21.3
next prev parent reply other threads:[~2020-06-02 21:58 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 ` [PATCH v2 12/16] python/machine.py: Add _qmp access shim John Snow
2020-06-02 21:45 ` John Snow [this message]
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-14-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).