[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 3/5] python/qemu: qmp: Make accept()'s timeout configurable
From: |
Wainer dos Santos Moschetta |
Subject: |
[PATCH v2 3/5] python/qemu: qmp: Make accept()'s timeout configurable |
Date: |
Tue, 4 Feb 2020 11:11:09 -0300 |
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
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
- [PATCH v2 0/5] python/qemu: qmp: Fix, delint and improvements, Wainer dos Santos Moschetta, 2020/02/04
- [PATCH v2 1/5] python/qemu: qmp: Replace socket.error with OSError, Wainer dos Santos Moschetta, 2020/02/04
- [PATCH v2 2/5] python/qemu: Delint the qmp module, Wainer dos Santos Moschetta, 2020/02/04
- [PATCH v2 4/5] python/qemu: qmp: Make QEMUMonitorProtocol a context manager, Wainer dos Santos Moschetta, 2020/02/04
- [PATCH v2 5/5] python/qemu: qmp: Remove unnused attributes, Wainer dos Santos Moschetta, 2020/02/04
- [PATCH v2 3/5] python/qemu: qmp: Make accept()'s timeout configurable,
Wainer dos Santos Moschetta <=
- Re: [PATCH v2 0/5] python/qemu: qmp: Fix, delint and improvements, Philippe Mathieu-Daudé, 2020/02/06