From patchwork Mon Feb 21 15:55:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Hedde X-Patchwork-Id: 1595655 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=greensocs.com header.i=@greensocs.com header.a=rsa-sha256 header.s=mail header.b=ipK7BuuD; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K2S0d1XT9z9sGP for ; Tue, 22 Feb 2022 03:09:03 +1100 (AEDT) Received: from localhost ([::1]:49220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMBFE-0005rT-4Z for incoming@patchwork.ozlabs.org; Mon, 21 Feb 2022 11:09:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMB2H-0006cj-UV for qemu-devel@nongnu.org; Mon, 21 Feb 2022 10:55:37 -0500 Received: from beetle.greensocs.com ([5.135.226.135]:35566) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMB2F-0002BB-BK for qemu-devel@nongnu.org; Mon, 21 Feb 2022 10:55:37 -0500 Received: from crumble.bar.greensocs.com (unknown [172.17.10.6]) by beetle.greensocs.com (Postfix) with ESMTPS id 1463B21CC4; Mon, 21 Feb 2022 15:55:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greensocs.com; s=mail; t=1645458934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=L9InGvuw5dK4vKcHkANkKnIbYK5rhAl1tiLfsUcR2vA=; b=ipK7BuuDSNtm2ro0VYVxoG+obU9SkwToaq5yuLo1oABbKhBlcuhE5WX+xJrmtDA76Xiqea B4gFmrm7gIw/dzkeMGkX0vjAFnpHFKp7Jv5AbiQK/mnx1ixg5aMj4yMyVsHt/Q9m+4nYUw 6roHKE68Fj6h0hfxu6YX1vNBP+NKoOI= From: Damien Hedde To: qemu-devel@nongnu.org Subject: [PATCH 3/5] python: qmp_shell: refactor disconnection handling Date: Mon, 21 Feb 2022 16:55:17 +0100 Message-Id: <20220221155519.2367-4-damien.hedde@greensocs.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221155519.2367-1-damien.hedde@greensocs.com> References: <20220221155519.2367-1-damien.hedde@greensocs.com> MIME-Version: 1.0 Received-SPF: pass client-ip=5.135.226.135; envelope-from=damien.hedde@greensocs.com; helo=beetle.greensocs.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: Damien Hedde , Eduardo Habkost , John Snow , Cleber Rosa Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Introduce QMPShellConnectError (subclass of QMPShellError) to handle disconnection in read_exec_command(). Signed-off-by: Damien Hedde --- python/qemu/aqmp/qmp_shell.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/python/qemu/aqmp/qmp_shell.py b/python/qemu/aqmp/qmp_shell.py index a1bd7d5630..cce7732ba2 100644 --- a/python/qemu/aqmp/qmp_shell.py +++ b/python/qemu/aqmp/qmp_shell.py @@ -142,6 +142,12 @@ class QMPShellParseError(QMPShellError): """ +class QMPShellConnectError(QMPShellError): + """ + QMP Shell Connect error class. + """ + + class FuzzyJSON(ast.NodeTransformer): """ This extension of ast.NodeTransformer filters literal "true/false/null" @@ -347,8 +353,7 @@ def _execute_cmd(self, cmdline: str) -> bool: self._print(qmpcmd) resp = self.cmd_obj(qmpcmd) if resp is None: - print('Disconnected') - return False + raise QMPShellConnectError('Disconnected') self._print(resp) return True @@ -400,6 +405,9 @@ def read_exec_command(self) -> bool: return self._execute_cmd(cmdline) except QMPShellParseError as err: self._print_parse_error(err) + except QMPShellConnectError as err: + print(f"{err!s}"); + return False return True def repl(self) -> Iterator[None]: @@ -481,8 +489,7 @@ def _execute_cmd(self, cmdline: str) -> bool: raise QMPShellParseError('cpu command takes an integer argument') resp = self._cmd_passthrough(cmdline, self._cpu_index) if resp is None: - print('Disconnected') - return False + raise QMPShellConnectError('Disconnected') assert 'return' in resp or 'error' in resp if 'return' in resp: # Success