[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/56] python: qemu: add timer parameter for qmp.accept socket
From: |
Hanna Reitz |
Subject: |
[PULL 01/56] python: qemu: add timer parameter for qmp.accept socket |
Date: |
Wed, 1 Sep 2021 17:15:24 +0200 |
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Also add a new _qmp_timer field to the QEMUMachine class.
Let's change the default socket timeout to None, so that if
a subclass needs to add a timer, it can be done by modifying
this private field.
At the same time, restore the timer to be 15 seconds in iotests.py, to
give an upper bound to the QMP monitor test command execution.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Acked-by: John Snow <jsnow@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210809090114.64834-2-eesposit@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
python/qemu/machine/machine.py | 7 +++++--
python/qemu/machine/qtest.py | 5 +++--
tests/qemu-iotests/iotests.py | 3 ++-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
index 971ed7e8c6..14c4d17eca 100644
--- a/python/qemu/machine/machine.py
+++ b/python/qemu/machine/machine.py
@@ -97,7 +97,8 @@ def __init__(self,
sock_dir: Optional[str] = None,
drain_console: bool = False,
console_log: Optional[str] = None,
- log_dir: Optional[str] = None):
+ log_dir: Optional[str] = None,
+ qmp_timer: Optional[float] = None):
'''
Initialize a QEMUMachine
@@ -112,6 +113,7 @@ def __init__(self,
@param drain_console: (optional) True to drain console socket to buffer
@param console_log: (optional) path to console log file
@param log_dir: where to create and keep log files
+ @param qmp_timer: (optional) default QMP socket timeout
@note: Qemu process is not started until launch() is used.
'''
# pylint: disable=too-many-arguments
@@ -121,6 +123,7 @@ def __init__(self,
self._binary = binary
self._args = list(args)
self._wrapper = wrapper
+ self._qmp_timer = qmp_timer
self._name = name or "qemu-%d" % os.getpid()
self._base_temp_dir = base_temp_dir
@@ -343,7 +346,7 @@ def _pre_launch(self) -> None:
def _post_launch(self) -> None:
if self._qmp_connection:
- self._qmp.accept()
+ self._qmp.accept(self._qmp_timer)
def _post_shutdown(self) -> None:
"""
diff --git a/python/qemu/machine/qtest.py b/python/qemu/machine/qtest.py
index d6d9c6a34a..592be263e0 100644
--- a/python/qemu/machine/qtest.py
+++ b/python/qemu/machine/qtest.py
@@ -115,7 +115,8 @@ def __init__(self,
name: Optional[str] = None,
base_temp_dir: str = "/var/tmp",
socket_scm_helper: Optional[str] = None,
- sock_dir: Optional[str] = None):
+ sock_dir: Optional[str] = None,
+ qmp_timer: Optional[float] = None):
# pylint: disable=too-many-arguments
if name is None:
@@ -124,7 +125,7 @@ def __init__(self,
sock_dir = base_temp_dir
super().__init__(binary, args, name=name, base_temp_dir=base_temp_dir,
socket_scm_helper=socket_scm_helper,
- sock_dir=sock_dir)
+ sock_dir=sock_dir, qmp_timer=qmp_timer)
self._qtest: Optional[QEMUQtestProtocol] = None
self._qtest_path = os.path.join(sock_dir, name + "-qtest.sock")
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 89663dac06..6b0db4ce54 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -570,10 +570,11 @@ class VM(qtest.QEMUQtestMachine):
def __init__(self, path_suffix=''):
name = "qemu%s-%d" % (path_suffix, os.getpid())
+ timer = 15.0
super().__init__(qemu_prog, qemu_opts, name=name,
base_temp_dir=test_dir,
socket_scm_helper=socket_scm_helper,
- sock_dir=sock_dir)
+ sock_dir=sock_dir, qmp_timer=timer)
self._num_drives = 0
def add_object(self, opts):
--
2.31.1
- [PULL 00/56] Block patches, Hanna Reitz, 2021/09/01
- [PULL 01/56] python: qemu: add timer parameter for qmp.accept socket,
Hanna Reitz <=
- [PULL 02/56] python: Reduce strictness of pylint's duplicate-code check, Hanna Reitz, 2021/09/01
- [PULL 03/56] python: qemu: pass the wrapper field from QEMUQtestmachine to QEMUMachine, Hanna Reitz, 2021/09/01
- [PULL 04/56] docs/devel/testing: add debug section to the QEMU iotests chapter, Hanna Reitz, 2021/09/01
- [PULL 06/56] qemu-iotests: delay QMP socket timers, Hanna Reitz, 2021/09/01
- [PULL 05/56] qemu-iotests: add option to attach gdbserver, Hanna Reitz, 2021/09/01
- [PULL 08/56] qemu-iotests: add gdbserver option to script tests too, Hanna Reitz, 2021/09/01
- [PULL 07/56] qemu_iotests: insert gdbserver command line as wrapper for qemu binary, Hanna Reitz, 2021/09/01
- [PULL 10/56] qemu-iotests: extend the check script to prepare supporting valgrind for python tests, Hanna Reitz, 2021/09/01
- [PULL 09/56] docs/devel/testing: add -gdb option to the debugging section of QEMU iotests, Hanna Reitz, 2021/09/01
- [PULL 11/56] qemu-iotests: extend QMP socket timeout when using valgrind, Hanna Reitz, 2021/09/01