From nobody Tue Feb 10 19:48:33 2026 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=1656592898; cv=none; d=zohomail.com; s=zohoarc; b=MrpwvkYFHS0r7oexFZyiiJMGfTB7R4BOjWMDuy0TyClXiEIVC4eh+orESviT3P1StJPUSZtonzwkdq0/dIi2rNylaTjd9wrxgYp2skRDmQfVxrDVYRAwYAWFfBzjhCHcJ5qfG9FCvWF4AqrwBFMQiVsLWEZY4AFhl8Z1JqUp+hU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656592898; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bSckYAWpr9FcEPLtfR0e6hVV7wSy7kRQQ9SKtegPjxE=; b=ea485JqqbPvtTzF2SrGQlFKxpXoBoJ5+jczS1hQB3VW7n4QYxSCNyloxqo/PsRbYQMUEHOmnYm7zYAkiNMOzLsGVLSYKHbvy6TW31CLqtGlRyYBUNsLl7+bjC9RPfUm6ZHx3tcLuXtmfoT4FbiaG2xDZ3MgXI/AhEGwMwUetWIU= 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 1656592898933927.4450114046117; Thu, 30 Jun 2022 05:41:38 -0700 (PDT) Received: from localhost ([::1]:38924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6tU7-0006AP-Qy for importer@patchew.org; Thu, 30 Jun 2022 08:41:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6tNn-0001GQ-FS for qemu-devel@nongnu.org; Thu, 30 Jun 2022 08:34:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:37504) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6tNV-0002M8-Jk for qemu-devel@nongnu.org; Thu, 30 Jun 2022 08:34:45 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-367-uOu62abpODmNtNIqEIpEtg-1; Thu, 30 Jun 2022 08:34:30 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1400A1C0013B; Thu, 30 Jun 2022 12:34:30 +0000 (UTC) Received: from localhost (unknown [10.39.208.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 221F641615A; Thu, 30 Jun 2022 12:34:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656592471; 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=bSckYAWpr9FcEPLtfR0e6hVV7wSy7kRQQ9SKtegPjxE=; b=Mo/w01yCwg9+c6apim1JbN7AgtfFvGp0KFC2+F+lwUXQJ2hasY/kJNVAb4/P7J10wF1T6J koUbs76EyyAXDJq9l90Z/1F/2sYMpgsof68+U9C2/QezWKqxyqg25Gwlo2AlLxO6Gdskj4 A7kC8c92nWQuDM314UBJoPE8u8ptJDY= X-MC-Unique: uOu62abpODmNtNIqEIpEtg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Cleber Rosa , Richard Henderson , John Snow , berrange@redhat.com, Beraldo Leal , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 1/3] python/qmp/protocol: add open_with_socket() Date: Thu, 30 Jun 2022 16:34:17 +0400 Message-Id: <20220630123419.1019367-2-marcandre.lureau@redhat.com> In-Reply-To: <20220630123419.1019367-1-marcandre.lureau@redhat.com> References: <20220630123419.1019367-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1656592900707100001 From: Marc-Andr=C3=A9 Lureau Instead of listening for incoming connections with a SocketAddr, add a new method open_with_socket() that accepts an existing socket. Signed-off-by: Marc-Andr=C3=A9 Lureau --- python/qemu/qmp/protocol.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/python/qemu/qmp/protocol.py b/python/qemu/qmp/protocol.py index 6ea86650ad24..4710a57f9126 100644 --- a/python/qemu/qmp/protocol.py +++ b/python/qemu/qmp/protocol.py @@ -18,6 +18,7 @@ from enum import Enum from functools import wraps import logging +import socket from ssl import SSLContext from typing import ( Any, @@ -296,6 +297,19 @@ async def start_server_and_accept( await self.accept() assert self.runstate =3D=3D Runstate.RUNNING =20 + @upper_half + @require(Runstate.IDLE) + async def open_with_socket(self, sock: socket.socket) -> None: + """ + Start connection with given socket. + + :param sock: A socket. + + :raise StateError: When the `Runstate` is not `IDLE`. + """ + self._reader, self._writer =3D await asyncio.open_connection(sock= =3Dsock) + self._set_state(Runstate.CONNECTING) + @upper_half @require(Runstate.IDLE) async def start_server(self, address: SocketAddrT, @@ -343,11 +357,12 @@ async def accept(self) -> None: protocol-level failure occurs while establishing a new session, the wrapped error may also be an `QMPError`. """ - if self._accepted is None: - raise QMPError("Cannot call accept() before start_server().") - await self._session_guard( - self._do_accept(), - 'Failed to establish connection') + if not self._reader: + if self._accepted is None: + raise QMPError("Cannot call accept() before start_server()= .") + await self._session_guard( + self._do_accept(), + 'Failed to establish connection') await self._session_guard( self._establish_session(), 'Failed to establish session') --=20 2.37.0.rc0 From nobody Tue Feb 10 19:48:33 2026 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=1656593118; cv=none; d=zohomail.com; s=zohoarc; b=N3/Q9QN7LCln80+H3Uk4tBXhBCAfLMCMBOJY1hEHEUmPhp0wIYtcQSP4BtElD8FNnRuCLAfb2+9k6lF+r6GaufM65Oj0zJURUoi/nXgCZhOjrq2vvGE4kTvbdZfZVOEympEcZjLzBSfleiNEz5OSIsA/n9/2nouPknIUTP32HuM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656593118; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=acfNEE+jF8Kbvxf5gT3sZcb8N5T6JldKBqTYFPg6/Fo=; b=PGQqGq/BdzpnRKTtLL6IhkX35fkb0c8dOymv7evVV3Bq2UIKPDLk6BxALJ/uAc9IbBFtttqKxn3cCMkicidqHmV/g6KJYHVHhnbjaBg+1212NbiXi/pnMZN65JRDDM1JqqhY3jZo7UaNkhH6y82LDI63KyEt/54seqwcXYpNTAg= 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 1656593118395527.456944512266; Thu, 30 Jun 2022 05:45:18 -0700 (PDT) Received: from localhost ([::1]:46196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6tXp-0003pd-4F for importer@patchew.org; Thu, 30 Jun 2022 08:45:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43670) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6tNq-0001HP-OV for qemu-devel@nongnu.org; Thu, 30 Jun 2022 08:35:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:46084) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6tNc-0002W1-DC for qemu-devel@nongnu.org; Thu, 30 Jun 2022 08:34:52 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-77-JwhknGffNx6sW1THY93KFw-1; Thu, 30 Jun 2022 08:34:34 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 42199299E746; Thu, 30 Jun 2022 12:34:34 +0000 (UTC) Received: from localhost (unknown [10.39.208.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FBF740C141F; Thu, 30 Jun 2022 12:34:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656592476; 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=acfNEE+jF8Kbvxf5gT3sZcb8N5T6JldKBqTYFPg6/Fo=; b=QtqIZnWAYPkYDzpD1KcrjR2jFdrKgTdGG84wjsEEsTnGKc5ksmTeA9OP7DyhORTdEjA/vZ wNcCXmJsAEjnMn1MvlK6c3HC9+dnRZ8lgcg9CUEH9FCNAiD2/m5IZKLlEzdTN5SZNDNuiI Z0sizfzwyBNP4T7FNVWtFmduTcA/psU= X-MC-Unique: JwhknGffNx6sW1THY93KFw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Cleber Rosa , Richard Henderson , John Snow , berrange@redhat.com, Beraldo Leal , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 2/3] python/qmp/legacy: make QEMUMonitorProtocol accept a socket Date: Thu, 30 Jun 2022 16:34:18 +0400 Message-Id: <20220630123419.1019367-3-marcandre.lureau@redhat.com> In-Reply-To: <20220630123419.1019367-1-marcandre.lureau@redhat.com> References: <20220630123419.1019367-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 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=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1656593120505100001 From: Marc-Andr=C3=A9 Lureau Teach QEMUMonitorProtocol to accept an exisiting socket. Signed-off-by: Marc-Andr=C3=A9 Lureau --- python/qemu/qmp/legacy.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/python/qemu/qmp/legacy.py b/python/qemu/qmp/legacy.py index 03b5574618fa..72e8f9af7362 100644 --- a/python/qemu/qmp/legacy.py +++ b/python/qemu/qmp/legacy.py @@ -22,6 +22,7 @@ # =20 import asyncio +import socket from types import TracebackType from typing import ( Any, @@ -69,22 +70,32 @@ class QEMUMonitorProtocol: =20 :param address: QEMU address, can be either a unix socket path (strin= g) or a tuple in the form ( address, port ) for a TCP - connection + connection or None + :param sock: a socket or None :param server: Act as the socket server. (See 'accept') :param nickname: Optional nickname used for logging. """ =20 - def __init__(self, address: SocketAddrT, + def __init__(self, + address: Optional[SocketAddrT] =3D None, + sock: Optional[socket.socket] =3D None, server: bool =3D False, nickname: Optional[str] =3D None): =20 + assert address or sock self._qmp =3D QMPClient(nickname) self._aloop =3D asyncio.get_event_loop() self._address =3D address + self._sock =3D sock self._timeout: Optional[float] =3D None =20 if server: - self._sync(self._qmp.start_server(self._address)) + if sock: + assert self._sock is not None + self._sync(self._qmp.open_with_socket(self._sock)) + else: + assert self._address is not None + self._sync(self._qmp.start_server(self._address)) =20 _T =3D TypeVar('_T') =20 @@ -139,6 +150,7 @@ def connect(self, negotiate: bool =3D True) -> Optional= [QMPMessage]: :return: QMP greeting dict, or None if negotiate is false :raise ConnectError: on connection errors """ + assert self._address is not None self._qmp.await_greeting =3D negotiate self._qmp.negotiate =3D negotiate =20 --=20 2.37.0.rc0 From nobody Tue Feb 10 19:48:33 2026 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=1656592849; cv=none; d=zohomail.com; s=zohoarc; b=gYfqvZAJM/tPBoVW1JHPy7OZhOb975LGel/x9K/DNltyeI9lcgx/nzHythAAnNDVgspiOHtoGRp0JCdZtiqmr6mec4XCZg75EprcJIaWSxHWBpVgIax6w/g8MWBT6D5haqeBlYEucqUcYyL63chmEh0sFGvLBEv1oj88XBNCO9M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656592849; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D5mZex/VXFzFL8KwXQDiCBS1wLu0ExEvLuEdXtR8Z0k=; b=J/t/1kvcFELAdld57K6q/fBvm6xN5ylL9/2fGnSCrLJac5R97g2J+Umz3Rpch6Rwyo0kWRSUDy62Y2zmbSDaSUf8qUFT/3pvpyvcn5nJa/+TzK5UOY8wNl6DHefkFTR2zoWN9NwH9SXf8PH3l6t+015ZHGdgsrAd134uH/dy+x0= 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 1656592849545857.277492963845; Thu, 30 Jun 2022 05:40:49 -0700 (PDT) Received: from localhost ([::1]:38258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6tTT-0005YF-RT for importer@patchew.org; Thu, 30 Jun 2022 08:40:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6tP3-0001RC-Sz for qemu-devel@nongnu.org; Thu, 30 Jun 2022 08:36:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:46837) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6tNh-0002Xz-Mq for qemu-devel@nongnu.org; Thu, 30 Jun 2022 08:34:59 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-363-849hMQbNMYmZzSoASroQXg-1; Thu, 30 Jun 2022 08:34:39 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7B61E3800C37; Thu, 30 Jun 2022 12:34:39 +0000 (UTC) Received: from localhost (unknown [10.39.208.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 583A71415108; Thu, 30 Jun 2022 12:34:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656592483; 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=D5mZex/VXFzFL8KwXQDiCBS1wLu0ExEvLuEdXtR8Z0k=; b=CdLKNIwkE3hzVHuqnxjYaRSGcujOvuXREACpHHf3Ih+Iq2/bLoJebrnna/M3NzIXyQw9Kk ZMpOqkujq7nz0c6dzx8Yq0bM0gp46kSwB9opm1UToPQ/Z/TodCxjeTCJCoVrRZqq4JjXvY zbN1WMFF15o38IX6n0JMKaUjia7wH9Y= X-MC-Unique: 849hMQbNMYmZzSoASroQXg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Cleber Rosa , Richard Henderson , John Snow , berrange@redhat.com, Beraldo Leal , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 3/3] python/qemu/machine: use socketpair() for QMP by default Date: Thu, 30 Jun 2022 16:34:19 +0400 Message-Id: <20220630123419.1019367-4-marcandre.lureau@redhat.com> In-Reply-To: <20220630123419.1019367-1-marcandre.lureau@redhat.com> References: <20220630123419.1019367-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1656592850731100001 From: Marc-Andr=C3=A9 Lureau When no monitor address is given, establish the QMP communication through a socketpair() (API is also supported on Windows since Python 3.5) Signed-off-by: Marc-Andr=C3=A9 Lureau --- python/qemu/machine/machine.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py index 37191f433b2d..aa1d9447352d 100644 --- a/python/qemu/machine/machine.py +++ b/python/qemu/machine/machine.py @@ -158,17 +158,13 @@ def __init__(self, self._qmp_timer =3D qmp_timer =20 self._name =3D name or f"qemu-{os.getpid()}-{id(self):02x}" + self._sock_pair: Optional[Tuple[socket.socket, socket.socket]] =3D= None self._temp_dir: Optional[str] =3D None self._base_temp_dir =3D base_temp_dir self._sock_dir =3D sock_dir self._log_dir =3D log_dir =20 - if monitor_address is not None: - self._monitor_address =3D monitor_address - else: - self._monitor_address =3D os.path.join( - self.sock_dir, f"{self._name}-monitor.sock" - ) + self._monitor_address =3D monitor_address =20 self._console_log_path =3D console_log if self._console_log_path: @@ -303,7 +299,11 @@ def _base_args(self) -> List[str]: args =3D ['-display', 'none', '-vga', 'none'] =20 if self._qmp_set: - if isinstance(self._monitor_address, tuple): + if self._sock_pair: + fd =3D self._sock_pair[0].fileno() + os.set_inheritable(fd, True) + moncdev =3D f"socket,id=3Dmon,fd=3D{fd}" + elif isinstance(self._monitor_address, tuple): moncdev =3D "socket,id=3Dmon,host=3D{},port=3D{}".format( *self._monitor_address ) @@ -337,10 +337,17 @@ def _pre_launch(self) -> None: self._remove_files.append(self._console_address) =20 if self._qmp_set: + monitor_address =3D None + sock =3D None + if self._monitor_address is None: + self._sock_pair =3D socket.socketpair() + sock =3D self._sock_pair[1] if isinstance(self._monitor_address, str): self._remove_files.append(self._monitor_address) + monitor_address =3D self._monitor_address self._qmp_connection =3D QEMUMonitorProtocol( - self._monitor_address, + address=3Dmonitor_address, + sock=3Dsock, server=3DTrue, nickname=3Dself._name ) @@ -360,6 +367,7 @@ def _pre_launch(self) -> None: )) =20 def _post_launch(self) -> None: + self._sock_pair[0].close() if self._qmp_connection: self._qmp.accept(self._qmp_timer) =20 --=20 2.37.0.rc0