From: Wainer dos Santos Moschetta <wainersm@redhat.com>
To: qemu-devel@nongnu.org
Cc: jsnow@redhat.com, philmd@redhat.com, ehabkost@redhat.com,
crosa@redhat.com
Subject: [PATCH v2 3/5] python/qemu: qmp: Make accept()'s timeout configurable
Date: Tue, 4 Feb 2020 11:11:09 -0300 [thread overview]
Message-ID: <20200204141111.3207-4-wainersm@redhat.com> (raw)
In-Reply-To: <20200204141111.3207-1-wainersm@redhat.com>
Currently the timeout of QEMUMonitorProtocol.accept() is
hard-coded to 15.0 seconds. This added the parameter `timeout`
so the value can be configured by the user.
Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
python/qemu/qmp.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/python/qemu/qmp.py b/python/qemu/qmp.py
index f4e04a6683..0e07d80e2a 100644
--- a/python/qemu/qmp.py
+++ b/python/qemu/qmp.py
@@ -154,16 +154,23 @@ class QEMUMonitorProtocol:
return self.__negotiate_capabilities()
return None
- def accept(self):
+ def accept(self, timeout=15.0):
"""
Await connection from QMP Monitor and perform capabilities negotiation.
+ @param timeout: timeout in seconds (nonnegative float number, or
+ None). The value passed will set the behavior of the
+ underneath QMP socket as described in [1]. Default value
+ is set to 15.0.
@return QMP greeting dict
@raise OSError on socket connection errors
@raise QMPConnectError if the greeting is not received
@raise QMPCapabilitiesError if fails to negotiate capabilities
+
+ [1]
+ https://docs.python.org/3/library/socket.html#socket.socket.settimeout
"""
- self.__sock.settimeout(15)
+ self.__sock.settimeout(timeout)
self.__sock, _ = self.__sock.accept()
self.__sockfile = self.__sock.makefile()
return self.__negotiate_capabilities()
--
2.23.0
next prev parent reply other threads:[~2020-02-04 14:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-04 14:11 [PATCH v2 0/5] python/qemu: qmp: Fix, delint and improvements Wainer dos Santos Moschetta
2020-02-04 14:11 ` [PATCH v2 1/5] python/qemu: qmp: Replace socket.error with OSError Wainer dos Santos Moschetta
2020-02-04 14:11 ` [PATCH v2 2/5] python/qemu: Delint the qmp module Wainer dos Santos Moschetta
2020-02-04 14:11 ` Wainer dos Santos Moschetta [this message]
2020-02-05 23:28 ` [PATCH v2 3/5] python/qemu: qmp: Make accept()'s timeout configurable John Snow
2020-02-04 14:11 ` [PATCH v2 4/5] python/qemu: qmp: Make QEMUMonitorProtocol a context manager Wainer dos Santos Moschetta
2020-02-05 23:43 ` John Snow
2020-02-04 14:11 ` [PATCH v2 5/5] python/qemu: qmp: Remove unnused attributes Wainer dos Santos Moschetta
2020-02-06 14:52 ` [PATCH v2 0/5] python/qemu: qmp: Fix, delint and improvements Philippe Mathieu-Daudé
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=20200204141111.3207-4-wainersm@redhat.com \
--to=wainersm@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jsnow@redhat.com \
--cc=philmd@redhat.com \
--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).