[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/46] python/qemu: qmp: Make accept()'s timeout configurable
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 03/46] python/qemu: qmp: Make accept()'s timeout configurable |
Date: |
Thu, 6 Feb 2020 22:18:53 +0100 |
From: Wainer dos Santos Moschetta <address@hidden>
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>
Reviewed-by: John Snow <address@hidden>
Message-Id: <address@hidden>
Signed-off-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.21.1
- [PULL 00/46] Python queue 2020-02-06, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 01/46] python/qemu: qmp: Replace socket.error with OSError, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 02/46] python/qemu: Delint the qmp module, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 04/46] python/qemu: qmp: Make QEMUMonitorProtocol a context manager, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 05/46] python/qemu: qmp: Remove unnused attributes, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 03/46] python/qemu: qmp: Make accept()'s timeout configurable,
Philippe Mathieu-Daudé <=
- [PULL 06/46] python/qemu: accel: Fix kvm_available() on ppc64le, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 07/46] qemu-deprecated: Remove text about Python 2, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 08/46] python: Treat None-return of greeting cmd, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 09/46] python/qemu/machine: Allow to use other serial consoles than default, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 10/46] Acceptance tests: Extract _console_interaction(), Philippe Mathieu-Daudé, 2020/02/06
- [PULL 11/46] Acceptance tests: Add interrupt_interactive_console_until_pattern(), Philippe Mathieu-Daudé, 2020/02/06
- [PULL 12/46] travis.yml: install rpm2cpio for acceptance tests, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 13/46] tests/boot_linux_console: add extract_from_rpm method, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 14/46] tests/boot_linux_console: use os.path for filesystem paths, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 15/46] tests/boot_linux_console: fix extract_from_deb() comment, Philippe Mathieu-Daudé, 2020/02/06