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, Max Reitz <mreitz@redhat.com>,
Cleber Rosa <crosa@redhat.com>, John Snow <jsnow@redhat.com>
Subject: [PATCH 08/20] python/machine.py: fix _popen access
Date: Tue, 6 Oct 2020 19:58:05 -0400 [thread overview]
Message-ID: <20201006235817.3280413-9-jsnow@redhat.com> (raw)
In-Reply-To: <20201006235817.3280413-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 | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/python/qemu/machine.py b/python/qemu/machine.py
index 3e9cf09fd2d..4e762fcd529 100644
--- a/python/qemu/machine.py
+++ b/python/qemu/machine.py
@@ -131,7 +131,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.
@@ -244,6 +244,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:
@@ -254,7 +260,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:
@@ -415,8 +421,8 @@ def _hard_shutdown(self) -> None:
waiting for the QEMU process to terminate.
"""
self._early_cleanup()
- self._popen.kill()
- self._popen.wait(timeout=60)
+ self._subp.kill()
+ self._subp.wait(timeout=60)
def _soft_shutdown(self, timeout: Optional[int],
has_quit: bool = False) -> None:
@@ -440,7 +446,7 @@ def _soft_shutdown(self, timeout: Optional[int],
self._qmp.cmd('quit')
# May raise subprocess.TimeoutExpired
- self._popen.wait(timeout=timeout)
+ self._subp.wait(timeout=timeout)
def _do_shutdown(self, timeout: Optional[int],
has_quit: bool = False) -> None:
--
2.26.2
next prev parent reply other threads:[~2020-10-07 0:12 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 23:57 [PATCH 00/20] python/qemu: strictly typed mypy conversion, pt2 John Snow
2020-10-06 23:57 ` [PATCH 01/20] python/qemu: use isort to lay out imports John Snow
2020-10-07 4:53 ` Philippe Mathieu-Daudé
2020-10-07 9:45 ` Kevin Wolf
2020-10-06 23:57 ` [PATCH 02/20] python/machine.py: Fix monitor address typing John Snow
2020-10-06 23:58 ` [PATCH 03/20] python/machine.py: reorder __init__ John Snow
2020-10-07 4:53 ` Philippe Mathieu-Daudé
2020-10-07 9:43 ` Kevin Wolf
2020-10-07 18:16 ` John Snow
2020-10-06 23:58 ` [PATCH 04/20] python/machine.py: Don't modify state in _base_args() John Snow
2020-10-06 23:58 ` [PATCH 05/20] python/machine.py: Handle None events in events_wait John Snow
2020-10-06 23:58 ` [PATCH 06/20] python/machine.py: use qmp.command John Snow
2020-10-07 4:54 ` Philippe Mathieu-Daudé
2020-10-06 23:58 ` [PATCH 07/20] python/machine.py: Add _qmp access shim John Snow
2020-10-07 9:53 ` Kevin Wolf
2020-10-07 18:21 ` John Snow
2020-10-06 23:58 ` John Snow [this message]
2020-10-07 10:07 ` [PATCH 08/20] python/machine.py: fix _popen access Kevin Wolf
2020-10-07 18:44 ` John Snow
2020-10-08 7:04 ` Kevin Wolf
2020-10-08 15:29 ` John Snow
2020-10-06 23:58 ` [PATCH 09/20] python/qemu: make 'args' style arguments immutable John Snow
2020-10-07 4:55 ` Philippe Mathieu-Daudé
2020-10-06 23:58 ` [PATCH 10/20] iotests.py: Adjust HMP kwargs typing John Snow
2020-10-06 23:58 ` [PATCH 11/20] python/qemu: Add mypy type annotations John Snow
2020-10-07 10:46 ` Kevin Wolf
2020-10-07 18:48 ` John Snow
2020-10-06 23:58 ` [PATCH 12/20] python/qemu/console_socket.py: Correct type of recv() John Snow
2020-10-07 10:59 ` Kevin Wolf
2020-10-07 18:49 ` John Snow
2020-10-06 23:58 ` [PATCH 13/20] python/qemu/console_socket.py: fix typing of settimeout John Snow
2020-10-07 10:59 ` Kevin Wolf
2020-10-06 23:58 ` [PATCH 14/20] python/qemu/console_socket.py: Clarify type of drain_thread John Snow
2020-10-07 10:59 ` Kevin Wolf
2020-10-06 23:58 ` [PATCH 15/20] python/qemu/console_socket.py: Add type hint annotations John Snow
2020-10-07 11:01 ` Kevin Wolf
2020-10-06 23:58 ` [PATCH 16/20] python/console_socket: avoid encoding to/from string John Snow
2020-10-07 11:10 ` Kevin Wolf
2020-10-06 23:58 ` [PATCH 17/20] python/qemu/qmp.py: Preserve error context on re-raise John Snow
2020-10-07 4:58 ` Philippe Mathieu-Daudé
2020-10-07 11:21 ` Kevin Wolf
2020-10-07 19:03 ` John Snow
2020-10-06 23:58 ` [PATCH 18/20] python/qemu/qmp.py: re-raise OSError when encountered John Snow
2020-10-07 4:59 ` Philippe Mathieu-Daudé
2020-10-07 11:30 ` Kevin Wolf
2020-10-07 19:17 ` John Snow
2020-10-08 23:41 ` John Snow
2020-10-06 23:58 ` [PATCH 19/20] python/qemu/qmp.py: Straighten out exception hierarchy John Snow
2020-10-07 12:53 ` Kevin Wolf
2020-10-06 23:58 ` [PATCH 20/20] python: add mypy config John Snow
2020-10-07 11:35 ` Kevin Wolf
2020-10-07 19:08 ` John Snow
2020-10-08 15:29 ` [PATCH 00/20] python/qemu: strictly typed mypy conversion, pt2 John Snow
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=20201006235817.3280413-9-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@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).