From: Cleber Rosa <crosa@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>,
qemu-devel@nongnu.org, Eduardo Habkost <ehabkost@redhat.com>
Cc: "Fam Zheng" <fam@euphon.net>,
"Aleksandar Rikalo" <arikalo@wavecomp.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Fabien Chouteau" <chouteau@adacore.com>,
"KONRAD Frederic" <frederic.konrad@adacore.com>,
"Hervé Poussineau" <hpoussin@reactos.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Willian Rampazzo" <wrampazz@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
qemu-ppc@nongnu.org,
"Aleksandar Rikalo" <aleksandar.rikalo@rt-rk.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PULL 3/16] Python libs: close console sockets before shutting down the VMs
Date: Mon, 28 Oct 2019 19:49:49 -0400 [thread overview]
Message-ID: <20191028235002.17691-4-crosa@redhat.com> (raw)
In-Reply-To: <20191028235002.17691-1-crosa@redhat.com>
Currently, the console socket on QEMUMachine is closed after the QMP
command to gracefully exit QEMU is executed. Because of a possible
deadlock (QEMU waiting for the socket to become writable) let's close
the console socket earlier.
Reference: <20190607034214.GB22416@habkost.net>
Reference: https://bugs.launchpad.net/qemu/+bug/1829779
From: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Cleber Rosa <crosa@redhat.com>
Message-Id: <20190911023558.4880-2-crosa@redhat.com>
---
python/qemu/machine.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/python/qemu/machine.py b/python/qemu/machine.py
index 2024e8b1b1..a4631d6934 100644
--- a/python/qemu/machine.py
+++ b/python/qemu/machine.py
@@ -277,10 +277,6 @@ class QEMUMachine(object):
self._qemu_log_path = None
- if self._console_socket is not None:
- self._console_socket.close()
- self._console_socket = None
-
if self._temp_dir is not None:
shutil.rmtree(self._temp_dir)
self._temp_dir = None
@@ -342,6 +338,13 @@ class QEMUMachine(object):
"""
Terminate the VM and clean up
"""
+ # If we keep the console socket open, we may deadlock waiting
+ # for QEMU to exit, while QEMU is waiting for the socket to
+ # become writeable.
+ if self._console_socket is not None:
+ self._console_socket.close()
+ self._console_socket = None
+
if self.is_running():
try:
if not has_quit:
--
2.21.0
next prev parent reply other threads:[~2019-10-29 0:10 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 23:49 [PULL 0/16] Python (acceptance tests) queue, 2019-10-28 Cleber Rosa
2019-10-28 23:49 ` [PULL 1/16] MAINTAINERS: update location of Python libraries Cleber Rosa
2019-10-28 23:49 ` [PULL 2/16] Acceptance tests: work around socket dir Cleber Rosa
2019-10-28 23:49 ` Cleber Rosa [this message]
2019-10-28 23:49 ` [PULL 4/16] Acceptance tests: refactor wait_for_console_pattern Cleber Rosa
2019-10-28 23:49 ` [PULL 5/16] tests/acceptance: Fix wait_for_console_pattern() hangs Cleber Rosa
2019-10-28 23:49 ` [PULL 6/16] tests/acceptance: Send <carriage return> on serial lines Cleber Rosa
2019-10-28 23:49 ` [PULL 7/16] tests/acceptance: Refactor exec_command_and_wait_for_pattern() Cleber Rosa
2019-10-28 23:49 ` [PULL 8/16] tests/acceptance: Add test that boots the HelenOS microkernel on Leon3 Cleber Rosa
2019-10-28 23:49 ` [PULL 9/16] .travis.yml: Let the avocado job run the Leon3 test Cleber Rosa
2019-10-28 23:49 ` [PULL 10/16] tests/acceptance: Add test that runs NetBSD 4.0 installer on PRep/40p Cleber Rosa
2019-10-28 23:49 ` [PULL 11/16] tests/acceptance: Test OpenBIOS on the PReP/40p Cleber Rosa
2019-10-28 23:49 ` [PULL 12/16] .travis.yml: Let the avocado job run the 40p tests Cleber Rosa
2019-10-28 23:49 ` [PULL 13/16] tests/boot_linux_console: Use Avocado archive::gzip_uncompress() Cleber Rosa
2019-10-28 23:50 ` [PULL 14/16] tests/boot_linux_console: Add a test for the Raspberry Pi 2 Cleber Rosa
2019-10-28 23:50 ` [PULL 15/16] tests/boot_linux_console: Add initrd test for the Exynos4210 Cleber Rosa
2019-10-28 23:50 ` [PULL 16/16] tests/boot_linux_console: Run BusyBox on 5KEc 64-bit cpu Cleber Rosa
2019-10-29 21:13 ` [PULL 0/16] Python (acceptance tests) queue, 2019-10-28 Peter Maydell
2019-10-29 21:51 ` Cleber Rosa
2019-10-29 21:58 ` Cleber Rosa
2019-10-29 23:40 ` Cleber Rosa
2019-10-30 14:10 ` Peter Maydell
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=20191028235002.17691-4-crosa@redhat.com \
--to=crosa@redhat.com \
--cc=aleksandar.rikalo@rt-rk.com \
--cc=alex.bennee@linaro.org \
--cc=arikalo@wavecomp.com \
--cc=aurelien@aurel32.net \
--cc=chouteau@adacore.com \
--cc=ehabkost@redhat.com \
--cc=fam@euphon.net \
--cc=frederic.konrad@adacore.com \
--cc=hpoussin@reactos.org \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=wainersm@redhat.com \
--cc=wrampazz@redhat.com \
/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).