summaryrefslogtreecommitdiffstats
path: root/python/qemu
diff options
context:
space:
mode:
authorJohn Snow2020-10-07 01:58:09 +0200
committerJohn Snow2020-10-20 15:37:57 +0200
commitff3513e6329ee0c2e7ea4a862c615cdb9c1ffc1b (patch)
tree6f55d166469dd84f75facd0d3ff6da3b4d5a930a /python/qemu
parentpython/qemu: Add mypy type annotations (diff)
downloadqemu-ff3513e6329ee0c2e7ea4a862c615cdb9c1ffc1b.tar.gz
qemu-ff3513e6329ee0c2e7ea4a862c615cdb9c1ffc1b.tar.xz
qemu-ff3513e6329ee0c2e7ea4a862c615cdb9c1ffc1b.zip
python/qemu/console_socket.py: Correct type of recv()
The type and parameter names of recv() should match socket.socket(). OK, easy enough, but in the cases we don't pass straight through to the real socket implementation, we probably can't accept such flags. OK, for now, assert that we don't receive flags in such cases. Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Message-id: 20201006235817.3280413-13-jsnow@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'python/qemu')
-rw-r--r--python/qemu/console_socket.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/python/qemu/console_socket.py b/python/qemu/console_socket.py
index 69f604c77f..cb3400a038 100644
--- a/python/qemu/console_socket.py
+++ b/python/qemu/console_socket.py
@@ -92,13 +92,14 @@ class ConsoleSocket(socket.socket):
for c in string:
self._buffer.extend(c)
- def recv(self, bufsize=1):
+ def recv(self, bufsize: int = 1, flags: int = 0) -> bytes:
"""Return chars from in memory buffer.
Maintains the same API as socket.socket.recv.
"""
if self._drain_thread is None:
# Not buffering the socket, pass thru to socket.
- return socket.socket.recv(self, bufsize)
+ return socket.socket.recv(self, bufsize, flags)
+ assert not flags, "Cannot pass flags to recv() in drained mode"
start_time = time.time()
while len(self._buffer) < bufsize:
time.sleep(self._sleep_time)