mirror of https://gitee.com/openkylin/qemu.git
python/aqmp: add send_fd_scm
Add an implementation for send_fd_scm to the async QMP implementation. Like socket_scm_helper mentions, a non-empty payload is required for QEMU to process the ancillary data. A space is most useful because it does not disturb the parsing of subsequent JSON objects. A note on "voiding the warranty": Python 3.11 removes support for calling sendmsg directly from a transport's socket. There is no other interface for doing this, our use case is, I suspect, "quite unique". As far as I can tell, this is safe to do -- send_fd_scm is a synchronous function and we can be guaranteed that the async coroutines will *not* be running when it is invoked. In testing, it works correctly. I investigated quite thoroughly the possibility of creating my own asyncio Transport (The class that ultimately manages the raw socket object) so that I could manage the socket myself, but this is so wildly invasive and unportable I scrapped the idea. It would involve a lot of copy-pasting of various python utilities and classes just to re-create the same infrastructure, and for extremely little benefit. Nah. Just boldly void the warranty instead, while I try to follow up on https://bugs.python.org/issue43232 Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-id: 20210923004938.3999963-5-jsnow@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
parent
6bfebc7306
commit
6e2f6ec561
|
@ -9,6 +9,8 @@
|
||||||
|
|
||||||
import asyncio
|
import asyncio
|
||||||
import logging
|
import logging
|
||||||
|
import socket
|
||||||
|
import struct
|
||||||
from typing import (
|
from typing import (
|
||||||
Dict,
|
Dict,
|
||||||
List,
|
List,
|
||||||
|
@ -624,3 +626,23 @@ async def execute(self, cmd: str,
|
||||||
"""
|
"""
|
||||||
msg = self.make_execute_msg(cmd, arguments, oob=oob)
|
msg = self.make_execute_msg(cmd, arguments, oob=oob)
|
||||||
return await self.execute_msg(msg)
|
return await self.execute_msg(msg)
|
||||||
|
|
||||||
|
@upper_half
|
||||||
|
@require(Runstate.RUNNING)
|
||||||
|
def send_fd_scm(self, fd: int) -> None:
|
||||||
|
"""
|
||||||
|
Send a file descriptor to the remote via SCM_RIGHTS.
|
||||||
|
"""
|
||||||
|
assert self._writer is not None
|
||||||
|
sock = self._writer.transport.get_extra_info('socket')
|
||||||
|
|
||||||
|
if sock.family != socket.AF_UNIX:
|
||||||
|
raise AQMPError("Sending file descriptors requires a UNIX socket.")
|
||||||
|
|
||||||
|
# Void the warranty sticker.
|
||||||
|
# Access to sendmsg in asyncio is scheduled for removal in Python 3.11.
|
||||||
|
sock = sock._sock # pylint: disable=protected-access
|
||||||
|
sock.sendmsg(
|
||||||
|
[b' '],
|
||||||
|
[(socket.SOL_SOCKET, socket.SCM_RIGHTS, struct.pack('@i', fd))]
|
||||||
|
)
|
||||||
|
|
Loading…
Reference in New Issue