From nobody Wed Nov 5 15:55:26 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497395282286379.1107381178374; Tue, 13 Jun 2017 16:08:02 -0700 (PDT) Received: from localhost ([::1]:45629 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKuun-0006kZ-0g for importer@patchew.org; Tue, 13 Jun 2017 19:08:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKutP-0005KT-Bu for qemu-devel@nongnu.org; Tue, 13 Jun 2017 19:06:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKutM-0001wz-Vm for qemu-devel@nongnu.org; Tue, 13 Jun 2017 19:06:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52318) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dKutM-0001wr-Pm for qemu-devel@nongnu.org; Tue, 13 Jun 2017 19:06:32 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E170F85365 for ; Tue, 13 Jun 2017 23:06:31 +0000 (UTC) Received: from localhost (ovpn-116-27.gru2.redhat.com [10.97.116.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77C5D7D67A; Tue, 13 Jun 2017 23:06:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E170F85365 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E170F85365 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 13 Jun 2017 20:06:25 -0300 Message-Id: <20170613230627.17942-2-ehabkost@redhat.com> In-Reply-To: <20170613230627.17942-1-ehabkost@redhat.com> References: <20170613230627.17942-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 13 Jun 2017 23:06:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] scripts/qmp: Accept timeout parameter on accept() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Shorter timeouts will be useful for test code that needs to catch QEMU exiting before it connects to the QMP socket. Signed-off-by: Eduardo Habkost --- scripts/qmp/qmp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/qmp/qmp.py b/scripts/qmp/qmp.py index 62d3651967..1b27064d91 100644 --- a/scripts/qmp/qmp.py +++ b/scripts/qmp/qmp.py @@ -132,7 +132,7 @@ class QEMUMonitorProtocol: if negotiate: return self.__negotiate_capabilities() =20 - def accept(self): + def accept(self, timeout=3D15): """ Await connection from QMP Monitor and perform capabilities negotia= tion. =20 @@ -141,7 +141,7 @@ class QEMUMonitorProtocol: @raise QMPConnectError if the greeting is not received @raise QMPCapabilitiesError if fails to negotiate capabilities """ - self.__sock.settimeout(15) + self.__sock.settimeout(timeout) self.__sock, _ =3D self.__sock.accept() self.__sockfile =3D self.__sock.makefile() return self.__negotiate_capabilities() --=20 2.11.0.259.g40922b1