From nobody Wed Nov 27 20:42:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697224620; cv=none; d=zohomail.com; s=zohoarc; b=HOP3W1oqbYeKs5lOq9B9LoxfRcXOHfw2dFWGmM6r4GKUUBHy8klQqjXa1RZULj1dw6n+R6j7tAG9JoMqAiZ0N4OcOArVXue2G8873dBTBhe11uuupk63IPM2lqvVoP996qXrsavR5d7hZ5ZytzBcoKn5j+onDrMMVcrUabhIlIs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697224620; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5f0J1I00tgVSiN9VRb+ChusZ1yvCyLAj0W1V3gjAZJo=; b=jjMQ3thxpo7+0RLxMeRnYksWomlOvhKFlNGmmBnDJGkr5gLfSXPmcnhjcdYcPAlG03HyanYISBF7FlLxUXGe+BtF4xHk9sf79zzVncVwU6yVBKxeR02sRLRk9sT2h5dH0IQQiWqT9YiVJpyj/rTlzBsqGafrjKsOYzQg0pqp7MI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1697224620891193.0965028799169; Fri, 13 Oct 2023 12:17:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrNYQ-0007Bz-9C; Fri, 13 Oct 2023 15:10:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qrNYG-0006sO-M1 for qemu-devel@nongnu.org; Fri, 13 Oct 2023 15:10:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qrNY5-0001tw-2J for qemu-devel@nongnu.org; Fri, 13 Oct 2023 15:10:24 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-303-eQiDZcfFPaugXpx9nL3Kew-1; Fri, 13 Oct 2023 15:09:51 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D5E0B85A5BA; Fri, 13 Oct 2023 19:09:49 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.32.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9876440C6CA0; Fri, 13 Oct 2023 19:09:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697224211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5f0J1I00tgVSiN9VRb+ChusZ1yvCyLAj0W1V3gjAZJo=; b=XBW1oIw/2HXma+japKO+EEU1KAPU/lCtx+JW4yHdB+dz9aDC6o9zdG2akMGdY9Kil0DECG BYE4xD7tv3qohGhIEM8VoAdmfcaKrxQghTzWRVGlFWFV9qB886MnnKqJR6YystdZsT2LU/ jQ7DnDrZDukh2qIcr1NvAHenxpPrio4= X-MC-Unique: eQiDZcfFPaugXpx9nL3Kew-1 From: John Snow To: qemu-devel@nongnu.org Cc: Kevin Wolf , Christian Borntraeger , Wainer dos Santos Moschetta , qemu-arm@nongnu.org, Vladimir Sementsov-Ogievskiy , Ani Sinha , Thomas Huth , Beraldo Leal , qemu-s390x@nongnu.org, Peter Xu , Peter Maydell , Markus Armbruster , Hanna Reitz , Vladimir Sementsov-Ogievskiy , John Snow , Eric Blake , Aurelien Jarno , =?UTF-8?q?Alex=20Benn=C3=A9e?= , "Michael S. Tsirkin" , Fabiano Rosas , qemu-block@nongnu.org, Eduardo Habkost , Juan Quintela , Leonardo Bras , Joel Stanley , Paolo Bonzini , Andrew Jeffery , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Eric Farman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Cleber Rosa , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 05/25] python/machine: use socketpair() for qtest connection Date: Fri, 13 Oct 2023 15:09:20 -0400 Message-ID: <20231013190941.3699288-6-jsnow@redhat.com> In-Reply-To: <20231013190941.3699288-1-jsnow@redhat.com> References: <20231013190941.3699288-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1697224623119100011 Like the QMP and console sockets, begin using socketpairs for the qtest connection, too. After this patch, we'll be able to remove the vestigial sock_dir argument, but that cleanup is best done in its own patch. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 Message-id: 20230928044943.849073-6-jsnow@redhat.com Signed-off-by: John Snow --- python/qemu/machine/qtest.py | 49 +++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/python/qemu/machine/qtest.py b/python/qemu/machine/qtest.py index 1c46138bd0..8180d3ab01 100644 --- a/python/qemu/machine/qtest.py +++ b/python/qemu/machine/qtest.py @@ -24,6 +24,7 @@ Optional, Sequence, TextIO, + Tuple, ) =20 from qemu.qmp import SocketAddrT @@ -38,23 +39,41 @@ class QEMUQtestProtocol: :param address: QEMU address, can be either a unix socket path (string) or a tuple in the form ( address, port ) for a TCP connection - :param server: server mode, listens on the socket (bool) + :param sock: An existing socket can be provided as an alternative to + an address. One of address or sock must be provided. + :param server: server mode, listens on the socket. Only meaningful + in conjunction with an address and not an existing + socket. + :raise socket.error: on socket connection errors =20 .. note:: No connection is established by __init__(), this is done by the connect() or accept() methods. """ - def __init__(self, address: SocketAddrT, + def __init__(self, + address: Optional[SocketAddrT] =3D None, + sock: Optional[socket.socket] =3D None, server: bool =3D False): + if address is None and sock is None: + raise ValueError("Either 'address' or 'sock' must be specified= ") + if address is not None and sock is not None: + raise ValueError( + "Either 'address' or 'sock' must be specified, but not bot= h") + if sock is not None and server: + raise ValueError("server=3DTrue is meaningless when passing so= cket") + self._address =3D address - self._sock =3D self._get_sock() + self._sock =3D sock or self._get_sock() self._sockfile: Optional[TextIO] =3D None + if server: + assert self._address is not None self._sock.bind(self._address) self._sock.listen(1) =20 def _get_sock(self) -> socket.socket: + assert self._address is not None if isinstance(self._address, tuple): family =3D socket.AF_INET else: @@ -67,7 +86,8 @@ def connect(self) -> None: =20 @raise socket.error on socket connection errors """ - self._sock.connect(self._address) + if self._address is not None: + self._sock.connect(self._address) self._sockfile =3D self._sock.makefile(mode=3D'r') =20 def accept(self) -> None: @@ -127,29 +147,40 @@ def __init__(self, base_temp_dir=3Dbase_temp_dir, sock_dir=3Dsock_dir, qmp_timer=3Dqmp_timer) self._qtest: Optional[QEMUQtestProtocol] =3D None - self._qtest_path =3D os.path.join(sock_dir, name + "-qtest.sock") + self._qtest_sock_pair: Optional[ + Tuple[socket.socket, socket.socket]] =3D None =20 @property def _base_args(self) -> List[str]: args =3D super()._base_args + assert self._qtest_sock_pair is not None + fd =3D self._qtest_sock_pair[0].fileno() args.extend([ - '-qtest', f"unix:path=3D{self._qtest_path}", + '-chardev', f"socket,id=3Dqtest,fd=3D{fd}", + '-qtest', 'chardev:qtest', '-accel', 'qtest' ]) return args =20 def _pre_launch(self) -> None: + self._qtest_sock_pair =3D socket.socketpair() + os.set_inheritable(self._qtest_sock_pair[0].fileno(), True) super()._pre_launch() - self._qtest =3D QEMUQtestProtocol(self._qtest_path, server=3DTrue) + self._qtest =3D QEMUQtestProtocol(sock=3Dself._qtest_sock_pair[1]) =20 def _post_launch(self) -> None: assert self._qtest is not None super()._post_launch() - self._qtest.accept() + if self._qtest_sock_pair: + self._qtest_sock_pair[0].close() + self._qtest.connect() =20 def _post_shutdown(self) -> None: + if self._qtest_sock_pair: + self._qtest_sock_pair[0].close() + self._qtest_sock_pair[1].close() + self._qtest_sock_pair =3D None super()._post_shutdown() - self._remove_if_exists(self._qtest_path) =20 def qtest(self, cmd: str) -> str: """ --=20 2.41.0