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.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 45AEEC74A21 for ; Wed, 10 Jul 2019 16:12:02 +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 1DDB92087F for ; Wed, 10 Jul 2019 16:12:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1DDB92087F 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]:35188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlFCL-0004Jo-ET for qemu-devel@archiver.kernel.org; Wed, 10 Jul 2019 12:12:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52190) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlF5t-0008AJ-0A for qemu-devel@nongnu.org; Wed, 10 Jul 2019 12:05:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlF5r-0002Ie-1N for qemu-devel@nongnu.org; Wed, 10 Jul 2019 12:05:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36706) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hlF5l-00020e-1j; Wed, 10 Jul 2019 12:05:13 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E3B1B4F63E; Wed, 10 Jul 2019 16:05:10 +0000 (UTC) Received: from dresden.str.redhat.com (unknown [10.40.205.108]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9D1A65D9CA; Wed, 10 Jul 2019 16:05:00 +0000 (UTC) To: John Snow , qemu-block@nongnu.org, qemu-devel@nongnu.org References: <20190710010556.32365-1-jsnow@redhat.com> <20190710010556.32365-4-jsnow@redhat.com> From: Max Reitz Openpgp: preference=signencrypt Autocrypt: addr=mreitz@redhat.com; prefer-encrypt=mutual; keydata= mQENBFXOJlcBCADEyyhOTsoa/2ujoTRAJj4MKA21dkxxELVj3cuILpLTmtachWj7QW+TVG8U /PsMCFbpwsQR7oEy8eHHZwuGQsNpEtNC2G/L8Yka0BIBzv7dEgrPzIu+W3anZXQW4702+uES U29G8TP/NGfXRRHGlbBIH9KNUnOSUD2vRtpOLXkWsV5CN6vQFYgQfFvmp5ZpPeUe6xNplu8V mcTw8OSEDW/ZnxJc8TekCKZSpdzYoxfzjm7xGmZqB18VFwgJZlIibt1HE0EB4w5GsD7x5ekh awIe3RwoZgZDLQMdOitJ1tUc8aqaxvgA4tz6J6st8D8pS//m1gAoYJWGwwIVj1DjTYLtABEB AAG0HU1heCBSZWl0eiA8bXJlaXR6QHJlZGhhdC5jb20+iQFTBBMBCAA9AhsDBQkSzAMABQsJ CAcCBhUICQoLAgQWAgMBAh4BAheABQJVzie5FRhoa3A6Ly9rZXlzLmdudXBnLm5ldAAKCRD0 B9sAYdXPQDcIB/9uNkbYEex1rHKz3mr12uxYMwLOOFY9fstP5aoVJQ1nWQVB6m2cfKGdcRe1 2/nFaHSNAzT0NnKz2MjhZVmcrpyd2Gp2QyISCfb1FbT82GMtXFj1wiHmPb3CixYmWGQUUh+I AvUqsevLA+WihgBUyaJq/vuDVM1/K9Un+w+Tz5vpeMidlIsTYhcsMhn0L9wlCjoucljvbDy/ 8C9L2DUdgi3XTa0ORKeflUhdL4gucWoAMrKX2nmPjBMKLgU7WLBc8AtV+84b9OWFML6NEyo4 4cP7cM/07VlJK53pqNg5cHtnWwjHcbpGkQvx6RUx6F1My3y52vM24rNUA3+ligVEgPYBuQEN BFXOJlcBCADAmcVUNTWT6yLWQHvxZ0o47KCP8OcLqD+67T0RCe6d0LP8GsWtrJdeDIQk+T+F xO7DolQPS6iQ6Ak2/lJaPX8L0BkEAiMuLCKFU6Bn3lFOkrQeKp3u05wCSV1iKnhg0UPji9V2 W5eNfy8F4ZQHpeGUGy+liGXlxqkeRVhLyevUqfU0WgNqAJpfhHSGpBgihUupmyUg7lfUPeRM DzAN1pIqoFuxnN+BRHdAecpsLcbR8sQddXmDg9BpSKozO/JyBmaS1RlquI8HERQoe6EynJhd 64aICHDfj61rp+/0jTIcevxIIAzW70IadoS/y3DVIkuhncgDBvGbF3aBtjrJVP+5ABEBAAGJ ASUEGAEIAA8FAlXOJlcCGwwFCRLMAwAACgkQ9AfbAGHVz0CbFwf9F/PXxQR9i4N0iipISYjU sxVdjJOM2TMut+ZZcQ6NSMvhZ0ogQxJ+iEQ5OjnIputKvPVd5U7WRh+4lF1lB/NQGrGZQ1ic alkj6ocscQyFwfib+xIe9w8TG1CVGkII7+TbS5pXHRxZH1niaRpoi/hYtgzkuOPp35jJyqT/ /ELbqQTDAWcqtJhzxKLE/ugcOMK520dJDeb6x2xVES+S5LXby0D4juZlvUj+1fwZu+7Io5+B bkhSVPb/QdOVTpnz7zWNyNw+OONo1aBUKkhq2UIByYXgORPFnbfMY7QWHcjpBVw9MgC4tGeF R4bv+1nAMMxKmb5VvQCExr0eFhJUAHAhVg== Message-ID: Date: Wed, 10 Jul 2019 18:04:58 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20190710010556.32365-4-jsnow@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="HJpHbyjV4AVr8neC85hZQ4PNEwpWQYhdm" X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 10 Jul 2019 16:05:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH 3/8] iotests/257: Refactor backup helpers 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 , Markus Armbruster Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --HJpHbyjV4AVr8neC85hZQ4PNEwpWQYhdm Content-Type: multipart/mixed; boundary="Rrzv7yJMc7smWQqaeWAkVFanE0aN7FW9E"; protected-headers="v1" From: Max Reitz To: John Snow , qemu-block@nongnu.org, qemu-devel@nongnu.org Cc: Markus Armbruster , Kevin Wolf , Eric Blake Message-ID: Subject: Re: [PATCH 3/8] iotests/257: Refactor backup helpers References: <20190710010556.32365-1-jsnow@redhat.com> <20190710010556.32365-4-jsnow@redhat.com> In-Reply-To: <20190710010556.32365-4-jsnow@redhat.com> --Rrzv7yJMc7smWQqaeWAkVFanE0aN7FW9E Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 10.07.19 03:05, John Snow wrote: > This test needs support for non-bitmap backups and missing or > unspecified bitmap sync modes, so rewrite the helpers to be a little > more generic. >=20 > Signed-off-by: John Snow > --- > tests/qemu-iotests/257 | 46 +++++---- > tests/qemu-iotests/257.out | 192 ++++++++++++++++++-------------------= > 2 files changed, 124 insertions(+), 114 deletions(-) >=20 > diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257 > index 2ff4aa8695..2eb4f26c28 100755 > --- a/tests/qemu-iotests/257 > +++ b/tests/qemu-iotests/257 [...] > -def bitmap_backup(drive, n, filepath, bitmap, bitmap_mode): > - log("--- Bitmap Backup #{:d} ---\n".format(n)) > - target_id =3D "bitmap_target_{:d}".format(n) > - job_id =3D "bitmap_backup_{:d}".format(n) > +def backup(drive, n, filepath, bitmap, bitmap_mode, sync=3D'bitmap'): > + log("--- Test Backup #{:d} ---\n".format(n)) > + target_id =3D "backup_target_{:d}".format(n) > + job_id =3D "backup_{:d}".format(n) > target_drive =3D Drive(filepath, vm=3Ddrive.vm) > =20 > target_drive.create_target(target_id, drive.fmt, drive.size) > - drive.vm.qmp_log("blockdev-backup", job_id=3Djob_id, device=3Ddriv= e.name, > - target=3Dtarget_id, sync=3D"bitmap", > - bitmap_mode=3Dbitmap_mode, > - bitmap=3Dbitmap, > - auto_finalize=3DFalse) > + > + kwargs =3D { > + 'job_id': job_id, > + 'auto_finalize': False, > + 'bitmap': bitmap, > + 'bitmap_mode': bitmap_mode, > + } > + kwargs =3D {key: val for key, val in kwargs.items() if val is not = None} I suppose this is to remove items that are None? Very cute, but why not just kwargs =3D { 'job_id': job_id, 'auto_finalize': False, } if bitmap is not None: kwargs['bitmap'] =3D bitmap kwargs['bitmap_mode'] =3D bitmap_mode Exactly the same number of lines, but immediately makes it clear what=E2=80= =99s going on. Not as cute, I admit. (Yes, I am indeed actively trying to train you not to write cute code.) The rest looks good to me: Reviewed-by: Max Reitz --Rrzv7yJMc7smWQqaeWAkVFanE0aN7FW9E-- --HJpHbyjV4AVr8neC85hZQ4PNEwpWQYhdm Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEkb62CjDbPohX0Rgp9AfbAGHVz0AFAl0mDKsACgkQ9AfbAGHV z0DPOQf+I58wkw7vqmLM9skLKM1IvFzKxgZqBtBYd1+4vjrsR/YmuY3K8Zl4KSIG bmkYMYX67+9es9g0VkO8zlHLMmBguqh22faxLbUn4age585H/r6XJvsRY2HlXUhf AdpKVJAEG1evLKZzz9HdykhEhvw5kNWQnFByh1O6XB8FyZdY+7MV2K34GiuXRkvM 5BaxXLyv8LpH7D1+01WUUYOSyWZ1RuBy4XWQm9ZZ/MN0MhKM/7vpijkzua/tu4oQ bS60jtPE5nT6opscIPYe1pm8lOx9asCmvhrw6VoYBMGdVLDJbOefgw1Mye7qLFv9 aaO4ds3/WoEalaRaD3IPw5t/tKXOrg== =mrDP -----END PGP SIGNATURE----- --HJpHbyjV4AVr8neC85hZQ4PNEwpWQYhdm--