From nobody Fri Nov 14 18:03:32 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=1589436435; cv=none; d=zohomail.com; s=zohoarc; b=QrbPVfUEytMVwaMPvEyOFhtcg/OzJLBOZbL1ut9ZaYpnnJBAdPGP1h52pihXPVYiKs14JDocFRLueErV+NeKm2EdXBgtToK322im4MbXHRwM1frsyMhV/OG0u2jVnvh4B+mH5NLhOi/sZBgUxYZ+Oxrh6Oo5Q1a/QyvIba5WBPk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589436435; 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=NtyIgPk9yeUBNgcGHwYRKWI3MzB5gYb3CrJMmsMyxXo=; b=eE/VvM6gQvrTpSdndj0G1mAzynmNZNLXApKKm3QPXcyPYdB1+LbA8djJcCwboAxMx2dZNxcc6fiuNVgy9iMAwiCpgkQjifUzBxk4/YA3A1/Q9DJVPQ6rAmqeSYtUKa1DvBZf39GGfqNZ02oR/nm7bG2n2a6MDoHNinSZHIkb5jE= 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 1589436435991265.9676247654884; Wed, 13 May 2020 23:07:15 -0700 (PDT) Received: from localhost ([::1]:54580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZ71W-00074p-MY for importer@patchew.org; Thu, 14 May 2020 02:07:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZ6pj-0005zF-4G for qemu-devel@nongnu.org; Thu, 14 May 2020 01:55:03 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:43098 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jZ6pi-0001ls-00 for qemu-devel@nongnu.org; Thu, 14 May 2020 01:55:02 -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-357-QADHVBuoODisHZU7Oz8InQ-1; Thu, 14 May 2020 01:54:59 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7AA45107ACCA; Thu, 14 May 2020 05:54:58 +0000 (UTC) Received: from probe.redhat.com (ovpn-113-9.rdu2.redhat.com [10.10.113.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D7D56A977; Thu, 14 May 2020 05:54:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589435701; 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=NtyIgPk9yeUBNgcGHwYRKWI3MzB5gYb3CrJMmsMyxXo=; b=S6hSpnK2veEzdxxqmfhUZVVrh/CMRc6noIyhTtuiVMy+nm1As639jL4wwdl6Mbuhq9iH5/ Splo7KRG0CUOYsMYvV9fcaf+sIFf2K1B//cH/3sivpw1ksi18xK9bdtkAS+KfaCyyU2J4m AYkVbAcDu6jHQHZXiHIw9+/YGp7NzHA= X-MC-Unique: QADHVBuoODisHZU7Oz8InQ-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH RFC 28/32] python//machine.py: fix _popen access Date: Thu, 14 May 2020 01:53:59 -0400 Message-Id: <20200514055403.18902-29-jsnow@redhat.com> In-Reply-To: <20200514055403.18902-1-jsnow@redhat.com> References: <20200514055403.18902-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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=207.211.31.120; envelope-from=jsnow@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/13 22:25:46 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_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: Fam Zheng , Kevin Wolf , Vladimir Sementsov-Ogievskiy , Eduardo Habkost , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Markus Armbruster , Max Reitz , John Snow , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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" As always, Optional[T] causes problems with unchecked access. Add a helper that asserts the pipe is present before we attempt to talk with it. Signed-off-by: John Snow --- python/qemu/lib/machine.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/python/qemu/lib/machine.py b/python/qemu/lib/machine.py index dfa8449b62..fb1a02b53c 100644 --- a/python/qemu/lib/machine.py +++ b/python/qemu/lib/machine.py @@ -113,7 +113,7 @@ def __init__(self, binary, args=3DNone, wrapper=3DNone,= name=3DNone, # Runstate self._qemu_log_path =3D None self._qemu_log_file =3D None - self._popen =3D None + self._popen: Optional['subprocess.Popen[bytes]'] =3D None self._events =3D [] self._iolog =3D None self._qmp_set =3D True # Enable QMP monitor by default. @@ -225,6 +225,12 @@ def is_running(self): """Returns true if the VM is running.""" return self._popen is not None and self._popen.poll() is None =20 + @property + def _subp(self) -> 'subprocess.Popen[bytes]': + if self._popen is None: + raise QEMUMachineError('Subprocess pipe not present') + return self._popen + def exitcode(self): """Returns the exit code if possible, or None.""" if self._popen is None: @@ -235,7 +241,7 @@ def get_pid(self): """Returns the PID of the running process, or None.""" if not self.is_running(): return None - return self._popen.pid + return self._subp.pid =20 def _load_io_log(self): if self._qemu_log_path is not None: @@ -352,7 +358,7 @@ def wait(self): """ Wait for the VM to power off """ - self._popen.wait() + self._subp.wait() if self._qmp: self._qmp.close() self._load_io_log() @@ -371,11 +377,11 @@ def _issue_shutdown(self, has_quit: bool =3D False) -= > None: self._qmp.close() =20 try: - self._popen.wait(timeout=3D3) + self._subp.wait(timeout=3D3) except subprocess.TimeoutExpired: - self._popen.kill() + self._subp.kill() =20 - self._popen.wait() + self._subp.wait() =20 def shutdown(self, has_quit: bool =3D False) -> None: """ --=20 2.21.1