From nobody Wed Jul 16 12:20:04 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622823491; cv=none; d=zohomail.com; s=zohoarc; b=EvS8emRSTftGdq2Klrwy5tt46aVcXEwubF/+rQHe98bay7Gna1ywtjXvNpdnstqJd4vozTET6dsc8o19ZQmNTFQXl7cEi6mHYwQXnsUUUbqtBZ5AnfYc17MhliIWKDltimNLr9EK4/Woywc3bQ6+mSECYtsH6alT3dMqZLR5RIU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622823491; 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=0BGW9H49/s3akhFMjW6DOae1MrwVJce9psBYCikG+W8=; b=iv/r4kKik9iW+PltsZfbtnO/rcIftpMsMkUI0hd8SeHgUsrWiE5OhVugE0cYetWs+dU7OyoqSEnPCNEnh8iGGORulVZsPEB8YzcoGCidonMwcU0TGZ26voP519pbTNTTn1DjQdjzWu9lhDnvYET3KQas96/rXq+0FrpUIdFQZi8= 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+importer2=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 162282349109166.9286431823881; Fri, 4 Jun 2021 09:18:11 -0700 (PDT) Received: from localhost ([::1]:33588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lpCWQ-0004l6-0N for importer2@patchew.org; Fri, 04 Jun 2021 12:18:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45574) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpCAq-00015N-2c for qemu-devel@nongnu.org; Fri, 04 Jun 2021 11:55:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58055) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpCAe-0001TS-3S for qemu-devel@nongnu.org; Fri, 04 Jun 2021 11:55:50 -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-517-5QdFa-zSN7m2NjS5MGe4CQ-1; Fri, 04 Jun 2021 11:55:37 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E242E9F92A; Fri, 4 Jun 2021 15:55:36 +0000 (UTC) Received: from scv.redhat.com (ovpn-116-137.rdu2.redhat.com [10.10.116.137]) by smtp.corp.redhat.com (Postfix) with ESMTP id A72D72BFF6; Fri, 4 Jun 2021 15:55:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622822139; 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=0BGW9H49/s3akhFMjW6DOae1MrwVJce9psBYCikG+W8=; b=E3oDkxTWFVrH3QyFoZCGSDQWnpRiQzAWLXam4P8M0gX+9cNlaAP5m0AFjXm4dfWDrCEj3f emn67HRwOQ9VRrLS9pgIdOKKVgSmQ4F+bvj7DtsevFU97PFRBb4h1OpjmBWePAZynT/Eo6 78NFuiUT904NRAyBlqVZMtKtJ9wYBiI= X-MC-Unique: 5QdFa-zSN7m2NjS5MGe4CQ-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH 02/11] scripts/qemu-ga-client: apply (most) flake8 rules Date: Fri, 4 Jun 2021 11:55:23 -0400 Message-Id: <20210604155532.1499282-3-jsnow@redhat.com> In-Reply-To: <20210604155532.1499282-1-jsnow@redhat.com> References: <20210604155532.1499282-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.373, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: Markus Armbruster , John Snow , "Niteesh G . S ." , Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" - Line length should be < 80 - You shouldn't perform unscoped imports except at the top of the module Notably, the sys.path hack creates problems with the import rule. This will be fixed later. Signed-off-by: John Snow --- scripts/qmp/qemu-ga-client | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/scripts/qmp/qemu-ga-client b/scripts/qmp/qemu-ga-client index 97f4047a62..566bddc89d 100755 --- a/scripts/qmp/qemu-ga-client +++ b/scripts/qmp/qemu-ga-client @@ -12,7 +12,8 @@ # Start QEMU with: # # # qemu [...] -chardev socket,path=3D/tmp/qga.sock,server=3Don,wait=3Doff= ,id=3Dqga0 \ -# -device virtio-serial -device virtserialport,chardev=3Dqga0,name=3Dorg= .qemu.guest_agent.0 +# -device virtio-serial \ +# -device virtserialport,chardev=3Dqga0,name=3Dorg.qemu.guest_agent.0 # # Run the script: # @@ -37,6 +38,7 @@ # =20 import base64 +import optparse import os import random import sys @@ -94,9 +96,11 @@ class QemuGuestAgentClient: msgs =3D [] msgs.append('version: ' + info['version']) msgs.append('supported_commands:') - enabled =3D [c['name'] for c in info['supported_commands'] if c['e= nabled']] + enabled =3D [c['name'] for c in info['supported_commands'] + if c['enabled']] msgs.append('\tenabled: ' + ', '.join(enabled)) - disabled =3D [c['name'] for c in info['supported_commands'] if not= c['enabled']] + disabled =3D [c['name'] for c in info['supported_commands'] + if not c['enabled']] msgs.append('\tdisabled: ' + ', '.join(disabled)) =20 return '\n'.join(msgs) @@ -119,11 +123,11 @@ class QemuGuestAgentClient: if ipaddr['ip-address-type'] =3D=3D 'ipv4': addr =3D ipaddr['ip-address'] mask =3D self.__gen_ipv4_netmask(int(ipaddr['prefi= x'])) - msgs.append("\tinet %s netmask %s" % (addr, mask)) + msgs.append(f"\tinet {addr} netmask {mask}") elif ipaddr['ip-address-type'] =3D=3D 'ipv6': addr =3D ipaddr['ip-address'] prefix =3D ipaddr['prefix'] - msgs.append("\tinet6 %s prefixlen %s" % (addr, pr= efix)) + msgs.append(f"\tinet6 {addr} prefixlen {prefix}") if nif['hardware-address'] !=3D '00:00:00:00:00:00': msgs.append("\tether " + nif['hardware-address']) =20 @@ -237,6 +241,8 @@ def _cmd_suspend(client, args): =20 def _cmd_shutdown(client, args): client.shutdown() + + _cmd_powerdown =3D _cmd_shutdown =20 =20 @@ -280,17 +286,15 @@ def main(address, cmd, args): =20 =20 if __name__ =3D=3D '__main__': - import optparse - import os - import sys + address =3D os.environ.get('QGA_CLIENT_ADDRESS') =20 - address =3D os.environ['QGA_CLIENT_ADDRESS'] if 'QGA_CLIENT_ADDRESS' i= n os.environ else None - - usage =3D "%prog [--address=3D|] [a= rgs...]\n" + usage =3D ("%prog [--address=3D|]" + " [args...]\n") usage +=3D ': ' + ', '.join(commands) parser =3D optparse.OptionParser(usage=3Dusage) parser.add_option('--address', action=3D'store', type=3D'string', - default=3Daddress, help=3D'Specify a ip:port pair or= a unix socket path') + default=3Daddress, + help=3D'Specify a ip:port pair or a unix socket path= ') options, args =3D parser.parse_args() =20 address =3D options.address --=20 2.31.1