From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E63E7C433DF for ; Sat, 20 Jun 2020 08:15:21 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9EB6C20734 for ; Sat, 20 Jun 2020 08:15:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BHxTRmIA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9EB6C20734 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmYem-0001Av-Pq for qemu-devel@archiver.kernel.org; Sat, 20 Jun 2020 04:15:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmYe5-0000d0-Ij for qemu-devel@nongnu.org; Sat, 20 Jun 2020 04:14:37 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:54128 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 1jmYe2-0005w2-VQ for qemu-devel@nongnu.org; Sat, 20 Jun 2020 04:14:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592640873; 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:autocrypt:autocrypt; bh=Gru4vfsWteSs3YmtrjgbwVrtZ+KfuL9dhhP1I72YIzw=; b=BHxTRmIAvzR24dG7RfWXgg2gdvVMbMhpBpnNuqOy/USP8tWPAIECQagEznW1rRzblgHw7b noFMww9tPOlc7MbHHSNd6FE2kyLyLJKhY04TZpD9Z5t4DZBabCB/Ca3Q9tUGrHCriOu0RL t5ifKTt/eK2H4LHksVu6NVsBACsQg5s= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-415-F-vvHG_2P_K3h-Gl8k3BGg-1; Sat, 20 Jun 2020 04:14:31 -0400 X-MC-Unique: F-vvHG_2P_K3h-Gl8k3BGg-1 Received: by mail-wr1-f70.google.com with SMTP id w4so6138835wrl.13 for ; Sat, 20 Jun 2020 01:14:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=Gru4vfsWteSs3YmtrjgbwVrtZ+KfuL9dhhP1I72YIzw=; b=e2iVTU/K0evvODJLDfU2pT3XXGjjkod4YJsHZbACl8DbVNCkyYk08Fn7upZ1Vl0Vzd zAhno5YEqarBM+ZtTRddYkzcKkJadPvHXRr85sh1n3Zw50Y3BXAmXSnalrPGCXwtq6Iq 7Ly4Ov66t11SRcIi+yRVJlMk5cXfHShYIMtB55EERNV/NH+qDNI29098g1WSSvw1Gi2x arghSBdcRq3AorWKUsceeGLlOeRVe+4xPQASj2bglZD4LMldcfFrKZxUhsRKFfmOL2ex cfn9Tgzgk7sKR5PvCe17+IRR7jCTe8KtUsB1oEItAolgWzmjhiM+ASue/agK4aKmkHGv HPuA== X-Gm-Message-State: AOAM5304GcjM4ZeNSRiTYMW8dInNbnir2oTiRKL32B7iaCyqIFUapy0H 92vr08AMkaXVru8DEeqampFvEyICJSBLaLhPFFI3l3QeVgxNE+huwAdd0SFzVeerptDJE85AMqq u8CnLNcbVYXoNfsA= X-Received: by 2002:adf:fd48:: with SMTP id h8mr8634800wrs.226.1592640869490; Sat, 20 Jun 2020 01:14:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTd3lPi6kbQcGv5Y3cFtzZSnh3yDncWrYn4/ELtYoBK3wvK+HD1+jgaxLYHwGyf8NW6jnljg== X-Received: by 2002:adf:fd48:: with SMTP id h8mr8634766wrs.226.1592640869103; Sat, 20 Jun 2020 01:14:29 -0700 (PDT) Received: from [192.168.1.37] (93.red-83-59-160.dynamicip.rima-tde.net. [83.59.160.93]) by smtp.gmail.com with ESMTPSA id e12sm9820475wro.52.2020.06.20.01.14.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 20 Jun 2020 01:14:28 -0700 (PDT) Subject: Re: [PATCH v3 12/16] python/machine.py: Add _qmp access shim To: John Snow , qemu-devel@nongnu.org, Eduardo Habkost , Wainer dos Santos Moschetta References: <20200604202236.25039-1-jsnow@redhat.com> <20200604202236.25039-13-jsnow@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Autocrypt: addr=philmd@redhat.com; keydata= mQINBDXML8YBEADXCtUkDBKQvNsQA7sDpw6YLE/1tKHwm24A1au9Hfy/OFmkpzo+MD+dYc+7 bvnqWAeGweq2SDq8zbzFZ1gJBd6+e5v1a/UrTxvwBk51yEkadrpRbi+r2bDpTJwXc/uEtYAB GvsTZMtiQVA4kRID1KCdgLa3zztPLCj5H1VZhqZsiGvXa/nMIlhvacRXdbgllPPJ72cLUkXf z1Zu4AkEKpccZaJspmLWGSzGu6UTZ7UfVeR2Hcc2KI9oZB1qthmZ1+PZyGZ/Dy+z+zklC0xl XIpQPmnfy9+/1hj1LzJ+pe3HzEodtlVA+rdttSvA6nmHKIt8Ul6b/h1DFTmUT1lN1WbAGxmg CH1O26cz5nTrzdjoqC/b8PpZiT0kO5MKKgiu5S4PRIxW2+RA4H9nq7nztNZ1Y39bDpzwE5Sp bDHzd5owmLxMLZAINtCtQuRbSOcMjZlg4zohA9TQP9krGIk+qTR+H4CV22sWldSkVtsoTaA2 qNeSJhfHQY0TyQvFbqRsSNIe2gTDzzEQ8itsmdHHE/yzhcCVvlUzXhAT6pIN0OT+cdsTTfif MIcDboys92auTuJ7U+4jWF1+WUaJ8gDL69ThAsu7mGDBbm80P3vvUZ4fQM14NkxOnuGRrJxO qjWNJ2ZUxgyHAh5TCxMLKWZoL5hpnvx3dF3Ti9HW2dsUUWICSQARAQABtDJQaGlsaXBwZSBN YXRoaWV1LURhdWTDqSAoUGhpbCkgPHBoaWxtZEByZWRoYXQuY29tPokCVQQTAQgAPwIbDwYL CQgHAwIGFQgCCQoLBBYCAwECHgECF4AWIQSJweePYB7obIZ0lcuio/1u3q3A3gUCXsfWwAUJ KtymWgAKCRCio/1u3q3A3ircD/9Vjh3aFNJ3uF3hddeoFg1H038wZr/xi8/rX27M1Vj2j9VH 0B8Olp4KUQw/hyO6kUxqkoojmzRpmzvlpZ0cUiZJo2bQIWnvScyHxFCv33kHe+YEIqoJlaQc JfKYlbCoubz+02E2A6bFD9+BvCY0LBbEj5POwyKGiDMjHKCGuzSuDRbCn0Mz4kCa7nFMF5Jv piC+JemRdiBd6102ThqgIsyGEBXuf1sy0QIVyXgaqr9O2b/0VoXpQId7yY7OJuYYxs7kQoXI 6WzSMpmuXGkmfxOgbc/L6YbzB0JOriX0iRClxu4dEUg8Bs2pNnr6huY2Ft+qb41RzCJvvMyu gS32LfN0bTZ6Qm2A8ayMtUQgnwZDSO23OKgQWZVglGliY3ezHZ6lVwC24Vjkmq/2yBSLakZE 6DZUjZzCW1nvtRK05ebyK6tofRsx8xB8pL/kcBb9nCuh70aLR+5cmE41X4O+MVJbwfP5s/RW 9BFSL3qgXuXso/3XuWTQjJJGgKhB6xXjMmb1J4q/h5IuVV4juv1Fem9sfmyrh+Wi5V1IzKI7 RPJ3KVb937eBgSENk53P0gUorwzUcO+ASEo3Z1cBKkJSPigDbeEjVfXQMzNt0oDRzpQqH2vp apo2jHnidWt8BsckuWZpxcZ9+/9obQ55DyVQHGiTN39hkETy3Emdnz1JVHTU0Q== Message-ID: <659c7e95-54c3-dc20-02e3-86ce4ca74a5f@redhat.com> Date: Sat, 20 Jun 2020 10:14:26 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200604202236.25039-13-jsnow@redhat.com> Content-Language: en-US X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/20 04:14:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=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: Kevin Wolf , Cleber Rosa , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 6/4/20 10:22 PM, John Snow wrote: > Like many other Optional[] types, it's not always a given that this > object will be set. Wrap it in a type-shim that raises a meaningful > error and will always return a concrete type. > > Signed-off-by: John Snow > --- > python/qemu/machine.py | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/python/qemu/machine.py b/python/qemu/machine.py > index d8289936816..a451f9000d6 100644 > --- a/python/qemu/machine.py > +++ b/python/qemu/machine.py > @@ -118,7 +118,7 @@ def __init__(self, binary, args=None, wrapper=None, name=None, > self._events = [] > self._iolog = None > self._qmp_set = True # Enable QMP monitor by default. > - self._qmp = None > + self._qmp_connection: Optional[qmp.QEMUMonitorProtocol] = None > self._qemu_full_args = None > self._temp_dir = None > self._launched = False > @@ -285,7 +285,7 @@ def _pre_launch(self): > if self._remove_monitor_sockfile: > assert isinstance(self._monitor_address, str) > self._remove_files.append(self._monitor_address) > - self._qmp = qmp.QEMUMonitorProtocol( > + self._qmp_connection = qmp.QEMUMonitorProtocol( > self._monitor_address, > server=True, > nickname=self._name > @@ -455,7 +455,13 @@ def set_qmp_monitor(self, enabled=True): > self._qmp_set = True > else: > self._qmp_set = False > - self._qmp = None > + self._qmp_connection = None > + > + @property > + def _qmp(self) -> qmp.QEMUMonitorProtocol: > + if self._qmp_connection is None: > + raise QEMUMachineError("Attempt to access QMP with no connection") > + return self._qmp_connection > > @classmethod > def _qmp_args(cls, _conv_keys: bool = True, **args: Any) -> Dict[str, Any]: > This patch breaks the EmptyCPUModel test: (043/101) tests/acceptance/empty_cpu_model.py:EmptyCPUModel.test: ERROR: Attempt to access QMP with no connection (0.03 s)