From nobody Tue Feb 10 05:46:36 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=1673424242; cv=none; d=zohomail.com; s=zohoarc; b=WmZ+gOPKlEDEZf5JIxN0SXW8vezG8uyafMWudtgHI9IZV6RplZCU7bcGS78wDqDYweELzTd/unm5W1ZBhDVVMjIG2rBDuRyl3qGCjhwyLwkuloSoKKu5qz8rKt4NNqethHKaPLM3N/zFceoeVxbcTev9LcNGhbCGFVyrHS9ihLc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673424242; 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=2IBCC0tTSA3CBKm91kOvQ1RQFB4uPUG6F/bRIBamZ0Y=; b=Ax6a/g32j7vHYoWNWnctik7bu2fDcaMEYtPr37rKWnxxOwRi+I/jiqmLfoPbgrvjmAVanXfNnlzznsBS7epUgrhRrUkLrhV/bOVbLXyf0eG3Y8iNiwdbGPmxL9T7J9QPyNOZmW6/66ShFx2L1D/UhBxmwWj4rtj4RYZX/R5RYKQ= 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 1673424242193547.9152962267908; Wed, 11 Jan 2023 00:04:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFW35-0000c7-RX; Wed, 11 Jan 2023 03:01:27 -0500 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 1pFW33-0000bZ-2h for qemu-devel@nongnu.org; Wed, 11 Jan 2023 03:01:25 -0500 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 1pFW31-0007oO-41 for qemu-devel@nongnu.org; Wed, 11 Jan 2023 03:01:24 -0500 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-489-HLGDhDEpMwCFhriV4hxGgA-1; Wed, 11 Jan 2023 03:01:20 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 87D48857F41 for ; Wed, 11 Jan 2023 08:01:20 +0000 (UTC) Received: from localhost (unknown [10.39.208.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9281340C2064; Wed, 11 Jan 2023 08:01:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673424082; 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=2IBCC0tTSA3CBKm91kOvQ1RQFB4uPUG6F/bRIBamZ0Y=; b=JZzYUz+HMGGiPct4NBNVQsjI9xmwxC/fejPSkqdNlwm4axkwgTRDQvaYA74JSTpd4cnnuB AD1Eftk/RlzqrjwZEY2sqJYAuKOxLWu6F9DRXFfZmD3P5OPcuyBtoWi8pnfK00n7Ug3zyp 6HXOB4GgTHkPvmnwkhqVZJZvYxy1cUs= X-MC-Unique: HLGDhDEpMwCFhriV4hxGgA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: berrange@redhat.com, Beraldo Leal , John Snow , Cleber Rosa , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v3 3/3] python/qemu/machine: use socketpair() for QMP by default Date: Wed, 11 Jan 2023 12:01:01 +0400 Message-Id: <20230111080101.969151-4-marcandre.lureau@redhat.com> In-Reply-To: <20230111080101.969151-1-marcandre.lureau@redhat.com> References: <20230111080101.969151-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 3.1 on 10.11.54.1 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: -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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673424243080100001 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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 748a0d807c..5b2e499e68 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.39.0