On 2/4/20 9:11 AM, Wainer dos Santos Moschetta wrote:
> 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 <waine...@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Reviewed-by: John Snow <js...@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()
>
--
—js
