From nobody Sun Nov 16 23:05:49 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602266179; cv=none; d=zohomail.com; s=zohoarc; b=NiwoFJcc2MjJrnD2BVXgfvTyD3QMsXSGiyp7NXGFIX3H+qQokYz3UvhJ7NvXHQmaUOKAY08SoGMDZTwskTBWDg/OvYhBooK8G8JrDVHrlKqosP1SkAFjY4a/HvkGZJ+jsgaauOYcn6GPZasE9MEZEMl9gWhcwpUn5QRiSxaO7rQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602266179; 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=tqTl4RtkP8A4aUSPCN1QLijelH/mJNfhb8wyLHrBLX4=; b=YMmnL1i4sf0b9Uqx+HhFIdIbHBjVLHakKqf9GzuwQ/KwjAbSpD7EBv2u3FMzxaNqYhV9K/1wJnSP3K6HLdK/FbizOwNVU/zQE8UneR0nkNaSbQyOL6RgOqA8EMFcp76S6Z4qisTnJsUFDG5p4C3clz1PvKAoKKJrMFvY3Gck2Zk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602266179840289.7505790072893; Fri, 9 Oct 2020 10:56:19 -0700 (PDT) Received: from localhost ([::1]:46110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQwcs-0005Or-Fw for importer@patchew.org; Fri, 09 Oct 2020 13:56:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQwYJ-00080c-BU for qemu-devel@nongnu.org; Fri, 09 Oct 2020 13:51:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38271) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kQwYG-0007IH-UL for qemu-devel@nongnu.org; Fri, 09 Oct 2020 13:51:34 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-381-e8YGJb_CP0-tFOjG_MtWog-1; Fri, 09 Oct 2020 13:51:30 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 83C4018C520A for ; Fri, 9 Oct 2020 17:51:28 +0000 (UTC) Received: from scv.redhat.com (ovpn-112-203.rdu2.redhat.com [10.10.112.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id C9EC076649; Fri, 9 Oct 2020 17:51:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602265891; 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=tqTl4RtkP8A4aUSPCN1QLijelH/mJNfhb8wyLHrBLX4=; b=B+baEBE4LRAqZyurCsbMyVItn+ZuZBoge7PRvlaRUnCqA5fx1niIThtfR409lZWLYsP0/E dua/gU2JXtqhXVqaiEsbXj4dDXEbofxdcCW1Lgjqes5Um5CBLLmzPbtyXy/gNRCJTAHr5z M8VYACdThTn2AnmDMr61xnGr+YSLVqg= X-MC-Unique: e8YGJb_CP0-tFOjG_MtWog-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH 1/3] python: add mypy config Date: Fri, 9 Oct 2020 13:51:21 -0400 Message-Id: <20201009175123.249009-2-jsnow@redhat.com> In-Reply-To: <20201009175123.249009-1-jsnow@redhat.com> References: <20201009175123.249009-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/09 02:34:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa , Paolo Bonzini , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Formalize the options used for checking the python library. You can run mypy from the directory that mypy.ini is in by typing `mypy qemu/`. Signed-off-by: John Snow --- python/mypy.ini | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 python/mypy.ini diff --git a/python/mypy.ini b/python/mypy.ini new file mode 100644 index 00000000000..7a70eca47c6 --- /dev/null +++ b/python/mypy.ini @@ -0,0 +1,4 @@ +[mypy] +strict =3D True +python_version =3D 3.6 +warn_unused_configs =3D True \ No newline at end of file --=20 2.26.2 From nobody Sun Nov 16 23:05:49 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602266134; cv=none; d=zohomail.com; s=zohoarc; b=dU2h9YGq6vXjE0Q2kDjof6BsdkOFpZqkqzOX1Guty2Zd+k0lWyQE5jChbF3vAPuhnWI+iAOgpve98GUVILeK/qONINIxC5Ver4QGROG36jG9LvQgYix8MI+pyOrowPOqrhvbLs7Z7r6oloFbN7nJjTCCwCQ9BXkkw0OCHGq9hXE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602266134; 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=9ktxWJqF//PoRxsFFkuG3Fy1XSt3Nh1HaEMcL3f4tOE=; b=CqrpZYSeamBCCPBC9P1bRcWcNsZDGQzhxbOXUfs0di6E+GlW9Sb73YtGN3Spy1yWbvIioeRhKHFbwupl2CPaRh38kBg15YppJAuNXF8/pTZZxuav+SKJ23m3mPMECz79YgyRPyj7rTF4BjCx2OZ7wqYMe/meJhd//0Yi6x4Crq0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160226613455936.55353664101244; Fri, 9 Oct 2020 10:55:34 -0700 (PDT) Received: from localhost ([::1]:43310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQwc9-0004Ay-87 for importer@patchew.org; Fri, 09 Oct 2020 13:55:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQwYJ-00080i-Dr for qemu-devel@nongnu.org; Fri, 09 Oct 2020 13:51:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44224) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kQwYG-0007IN-U4 for qemu-devel@nongnu.org; Fri, 09 Oct 2020 13:51:35 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-461-ENvizNPTNeyvsH0xHMLDFA-1; Fri, 09 Oct 2020 13:51:30 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7254B80B714 for ; Fri, 9 Oct 2020 17:51:29 +0000 (UTC) Received: from scv.redhat.com (ovpn-112-203.rdu2.redhat.com [10.10.112.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id A857D7664F; Fri, 9 Oct 2020 17:51:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602265892; 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=9ktxWJqF//PoRxsFFkuG3Fy1XSt3Nh1HaEMcL3f4tOE=; b=NnnmQ+P3YcGg/Z2Khh/VAHVeCHviEPXhvIkMR3HJcEm54SYBmtBziFECL0PhUlWRytsVA5 OXIlniztTQn1nQNAQSpoqi5P1kQSGiXXllYiAsaKTegS9OTPscI5HdvlrlsWh2OBZyb43Q 0WX4h2Ov+1bWWK5brk34No3YYkxo9Fg= X-MC-Unique: ENvizNPTNeyvsH0xHMLDFA-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH 2/3] python/qemu/qmp.py: re-raise OSError when encountered Date: Fri, 9 Oct 2020 13:51:22 -0400 Message-Id: <20201009175123.249009-3-jsnow@redhat.com> In-Reply-To: <20201009175123.249009-1-jsnow@redhat.com> References: <20201009175123.249009-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/09 02:34:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa , Paolo Bonzini , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Nested if conditions don't change when the exception block fires; we need to explicitly re-raise the error if we didn't intend to capture and suppress it. Signed-off-by: John Snow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- python/qemu/qmp.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/python/qemu/qmp.py b/python/qemu/qmp.py index d911999da1f..4969e5741cb 100644 --- a/python/qemu/qmp.py +++ b/python/qemu/qmp.py @@ -165,14 +165,15 @@ def __get_events(self, wait: Union[bool, float] =3D F= alse) -> None: """ =20 # Check for new events regardless and pull them into the cache: - self.__sock.setblocking(False) try: + self.__sock.setblocking(False) self.__json_read() except OSError as err: - if err.errno =3D=3D errno.EAGAIN: - # No data available - pass - self.__sock.setblocking(True) + # EAGAIN: No data available; not critical + if err.errno !=3D errno.EAGAIN: + raise + finally: + self.__sock.setblocking(True) =20 # Wait for new events, if needed. # if wait is 0.0, this means "no wait" and is also implicitly fals= e. --=20 2.26.2 From nobody Sun Nov 16 23:05:49 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602265993; cv=none; d=zohomail.com; s=zohoarc; b=ckiAr/KDICTqSzW4wZ9gG8Kx74ZBKi/UjXrt6kup5aWIxPbBjRIpory7URt1lGD9XEkIhEN+swJjNiUjONq0+o5WTUFSKOJFLfUF7z3AQruFCsumMpSzAxYzQnWm+8Af5nye85prbdsgnU+8gY1A4Vk9aRWAnvwKCVlgFVmO1SU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602265993; 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=oyzenvM/Pbt+6CygNYoQChDMErS4knDfk+/2CMuuh5Y=; b=mR8yX0o5DncLacCDv4B10+W0iJ0xiuBmVeRQB1YW/uc+7DFGuevBXhmgp9JBgnwvXfoehgVv9cheVrFqQIF+HseWyqjaMIAw2o/TAo0PkQRttC4gc9BedXurA7oibbKXkaN6j57Sn7hW4Fd0CNbqOVIrYUvKQIPnwHEtFiTrkK8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602265993621861.1335898699004; Fri, 9 Oct 2020 10:53:13 -0700 (PDT) Received: from localhost ([::1]:35514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQwZr-0000pZ-ME for importer@patchew.org; Fri, 09 Oct 2020 13:53:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQwYJ-000812-Ku for qemu-devel@nongnu.org; Fri, 09 Oct 2020 13:51:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37273) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kQwYH-0007Il-NL for qemu-devel@nongnu.org; Fri, 09 Oct 2020 13:51:35 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-493-ssSSxA1rO1620982LAYJ5w-1; Fri, 09 Oct 2020 13:51:31 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 40BBCADC22 for ; Fri, 9 Oct 2020 17:51:30 +0000 (UTC) Received: from scv.redhat.com (ovpn-112-203.rdu2.redhat.com [10.10.112.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8477376649; Fri, 9 Oct 2020 17:51:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602265893; 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=oyzenvM/Pbt+6CygNYoQChDMErS4knDfk+/2CMuuh5Y=; b=Kw6X44LU6VDPadc2UNLcSAavydfBa0oM5v+4s6ljXRZHfspDslmN3W6T/VcRZUjynh/Bit lAg+xGhFzTiiBTq3jrUJ8vBRyhywYH5OhZ55UPNb7nVslcn7dCaTocEjBMp5SZr8Ba2G3y CqVuky8FncoHeZlZMmrmSloS8LCL7ic= X-MC-Unique: ssSSxA1rO1620982LAYJ5w-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH 3/3] python/qemu/qmp.py: Fix settimeout operation Date: Fri, 9 Oct 2020 13:51:23 -0400 Message-Id: <20201009175123.249009-4-jsnow@redhat.com> In-Reply-To: <20201009175123.249009-1-jsnow@redhat.com> References: <20201009175123.249009-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/09 02:34:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa , Paolo Bonzini , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We enabled callers to interface directly with settimeout, but this reacts poorly with blocking/nonblocking operation; as they are using the same internal mechanism. 1. Whenever we change the blocking mechanism temporarily, always set it back to what it was afterwards. 2. Disallow callers from setting a timeout of "0", which means Non-blocking mode. This is going to create more weird problems than anybody wants, so just forbid it. I opt not to coerce '0' to 'None' to maintain the principal of least surprise in mirroring the semantics of Python's interface. Signed-off-by: John Snow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- python/qemu/qmp.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/python/qemu/qmp.py b/python/qemu/qmp.py index 4969e5741cb..f64517fb0a7 100644 --- a/python/qemu/qmp.py +++ b/python/qemu/qmp.py @@ -164,16 +164,19 @@ def __get_events(self, wait: Union[bool, float] =3D F= alse) -> None: retrieved or if some other error occurred. """ =20 + # Current timeout and blocking status + current_timeout =3D self.__sock.gettimeout() + # Check for new events regardless and pull them into the cache: try: - self.__sock.setblocking(False) + self.__sock.settimeout(0) # i.e. setblocking(False) self.__json_read() except OSError as err: # EAGAIN: No data available; not critical if err.errno !=3D errno.EAGAIN: raise finally: - self.__sock.setblocking(True) + self.__sock.settimeout(current_timeout) =20 # Wait for new events, if needed. # if wait is 0.0, this means "no wait" and is also implicitly fals= e. @@ -187,9 +190,11 @@ def __get_events(self, wait: Union[bool, float] =3D Fa= lse) -> None: except Exception as err: msg =3D "Error while reading from socket" raise QMPConnectError(msg) from err + finally: + self.__sock.settimeout(current_timeout) + if ret is None: raise QMPConnectError("Error while reading from socket") - self.__sock.settimeout(None) =20 def __enter__(self) -> 'QEMUMonitorProtocol': # Implement context manager enter function. @@ -219,7 +224,7 @@ def connect(self, negotiate: bool =3D True) -> Optional= [QMPMessage]: return self.__negotiate_capabilities() return None =20 - def accept(self, timeout: float =3D 15.0) -> QMPMessage: + def accept(self, timeout: Optional[float] =3D 15.0) -> QMPMessage: """ Await connection from QMP Monitor and perform capabilities negotia= tion. =20 @@ -338,13 +343,19 @@ def close(self) -> None: if self.__sockfile: self.__sockfile.close() =20 - def settimeout(self, timeout: float) -> None: + def settimeout(self, timeout: Optional[float]) -> None: """ Set the socket timeout. =20 - @param timeout (float): timeout in seconds, or None. + @param timeout (float): timeout in seconds (non-zero), or None. @note This is a wrap around socket.settimeout + + @raise ValueError: if timeout was set to 0. """ + if timeout =3D=3D 0: + msg =3D "timeout cannot be 0; this engages non-blocking mode." + msg +=3D " Use 'None' instead to disable timeouts." + raise ValueError(msg) self.__sock.settimeout(timeout) =20 def get_sock_fd(self) -> int: --=20 2.26.2