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=-15.7 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,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 CE7D7C4708F for ; Wed, 2 Jun 2021 23:44:34 +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 5326F6023B for ; Wed, 2 Jun 2021 23:44:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5326F6023B 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]:34728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loaXJ-0000X7-Gc for qemu-devel@archiver.kernel.org; Wed, 02 Jun 2021 19:44:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loaWQ-0008H1-Oh for qemu-devel@nongnu.org; Wed, 02 Jun 2021 19:43:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54033) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loaWO-0001q4-Oa for qemu-devel@nongnu.org; Wed, 02 Jun 2021 19:43:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622677415; 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=zV/KeTpFGNgUlw1AkpZBHfXaHoURd5sHtoyHnzluBPk=; b=JcXKItH74qPAwRyFgvNzYz4L1FoLFL+MLVhTL06d59TdxB1ZeOkTHY1khL0F4tegmQLpYO xVSq0jrcCvk1gGLzmadW9WlRZ6g1D2Ls1BTVnXJ1xukBO0J1ynR0bdomjPylm3JZFowrD8 hGq1yk8hNCeaZDoVzUMX+6lfPGB+CL8= 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-239-S2wiPODmP5OxgquScaHq5Q-1; Wed, 02 Jun 2021 19:43:34 -0400 X-MC-Unique: S2wiPODmP5OxgquScaHq5Q-1 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 32395803621; Wed, 2 Jun 2021 23:43:33 +0000 (UTC) Received: from [10.10.116.137] (ovpn-116-137.rdu2.redhat.com [10.10.116.137]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8FA8C60C16; Wed, 2 Jun 2021 23:43:31 +0000 (UTC) Subject: Re: [PATCH v4 26/35] python/qemu/machine: QEMUMachine: improve qmp() method To: Vladimir Sementsov-Ogievskiy , qemu-block@nongnu.org References: <20210602131108.74979-1-vsementsov@virtuozzo.com> <20210602131108.74979-27-vsementsov@virtuozzo.com> From: John Snow Message-ID: <8795df19-c215-c6c1-365c-4aa914f45704@redhat.com> Date: Wed, 2 Jun 2021 19:43:31 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210602131108.74979-27-vsementsov@virtuozzo.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.371, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.613, RCVD_IN_DNSWL_LOW=-0.7, 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: kwolf@redhat.com, berrange@redhat.com, ehabkost@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com, crosa@redhat.com, pbonzini@redhat.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 6/2/21 9:10 AM, Vladimir Sementsov-Ogievskiy wrote: > We often call qmp() with unpacking dict, like qmp('foo', **{...}). > mypy don't really like it, it thinks that passed unpacked dict is a > positional argument and complains that it type should be bool (because > second argument of qmp() is conv_keys: bool). > > Allow passing dict directly, simplifying interface, and giving a way to > satisfy mypy. > > Signed-off-by: Vladimir Sementsov-Ogievskiy > Reviewed-by: Max Reitz > --- > python/qemu/machine.py | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/python/qemu/machine.py b/python/qemu/machine.py > index ff35f2cd6c..7a14605040 100644 > --- a/python/qemu/machine.py > +++ b/python/qemu/machine.py > @@ -549,11 +549,21 @@ def _qmp_args(cls, conv_keys: bool, > return args > > def qmp(self, cmd: str, > - conv_keys: bool = True, > + args_dict: Optional[Dict[str, Any]] = None, try using object here, too. > + conv_keys: Optional[bool] = None, > **args: Any) -> QMPMessage: > """ > Invoke a QMP command and return the response dict > """ > + if args_dict is not None: > + assert not args > + assert conv_keys is None > + args = args_dict > + conv_keys = False > + > + if conv_keys is None: > + conv_keys = True > + > qmp_args = self._qmp_args(conv_keys, args) > return self._qmp.cmd(cmd, args=qmp_args) > > With the comment addressed: Reviewed-by: John Snow Thanks, --js