From nobody Thu May 2 08:22:24 2024 Delivered-To: importer@patchew.org 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; 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=1579504498; cv=none; d=zohomail.com; s=zohoarc; b=GFd+1E6IPlXHKx9plx/cZ6qDGhUiG3eJ24lwt2x06KytoGYO2pGhlVCo8kDvBZHheSnwDPvaIWVsBlI67Oif8wC4RNQ1vFmkzbQ3eeI/NkmsPeIZNXOZEAIxnyWHMZ13gPZCPzAxazu58Bn8ZfFfh3On5EdmgH+WVxI3bEVOZNM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579504498; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=ZEdzfbgoBSVAGmOfLN7NxhMnCshOiuHcK4zXq8eWo74=; b=Aq/BOLgihyyagKkwMk5H80bMUBd6J0UJN/nCbCeoM0hyOhvP9hUEUQ8tFLhd8ETlINz1A9KhGiMIxE+To92Anz3OmUdva3gufSdj/uEXhYoZxC4OmAn6UBV8mo+i239gfEDY9wy4WLnYq4oA6tVHHIcl6RfjuCogFnXgKKoBXU0= 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 1579504498288524.1889870312763; Sun, 19 Jan 2020 23:14:58 -0800 (PST) Received: from localhost ([::1]:59504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itRGy-0007gc-7i for importer@patchew.org; Mon, 20 Jan 2020 02:14:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41453) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itRG9-0007DP-EC for qemu-devel@nongnu.org; Mon, 20 Jan 2020 02:14:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itRG7-0000QJ-5L for qemu-devel@nongnu.org; Mon, 20 Jan 2020 02:14:04 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:36130 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1itRG6-0000Pd-MA for qemu-devel@nongnu.org; Mon, 20 Jan 2020 02:14:03 -0500 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-304-whDgAZhGN8idZl4fkXujNw-1; Mon, 20 Jan 2020 02:12:13 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 78532107ACC5 for ; Mon, 20 Jan 2020 07:12:12 +0000 (UTC) Received: from localhost.localdomain (ovpn-206-44.brq.redhat.com [10.40.206.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EDE584790; Mon, 20 Jan 2020 07:12:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579504441; 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; bh=ZEdzfbgoBSVAGmOfLN7NxhMnCshOiuHcK4zXq8eWo74=; b=igMgWWY72m0cCmKlioTk7rrxIgkUxyZCNOMhW+iQZ9ahjcZ2Vh/6xg0QoxA8twH+9u5i7h 4n8nBumA5zNjpDJXRjHZAO6uVKusMisck+RezY1dhQithqRIvLqf/NraeDSP2lB4HxhVpT MbQSsuUUqfknhb4nLcbQjeelJXT6WGw= From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= To: qemu-devel@nongnu.org Subject: [PATCH] python: Treat None-return of greeting cmd Date: Mon, 20 Jan 2020 08:12:02 +0100 Message-Id: <20200120071202.30646-1-ldoktor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: whDgAZhGN8idZl4fkXujNw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: ldoktor@redhat.com, ehabkost@redhat.com, crosa@redhat.com 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" In case qemu process dies the "monitor.cmd" returns None which gets passed to the "__negotiate_capabilities" and leads to unhandled exception. Let's only check the resp in case it has a value. Signed-off-by: Luk=C3=A1=C5=A1 Doktor Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Wainer dos Santos Moschetta --- python/qemu/qmp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/qemu/qmp.py b/python/qemu/qmp.py index 5c8cf6a056..a3e5de718a 100644 --- a/python/qemu/qmp.py +++ b/python/qemu/qmp.py @@ -73,7 +73,7 @@ class QEMUMonitorProtocol(object): raise QMPConnectError # Greeting seems ok, negotiate capabilities resp =3D self.cmd('qmp_capabilities') - if "return" in resp: + if resp and "return" in resp: return greeting raise QMPCapabilitiesError =20 --=20 2.21.0