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=-6.5 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 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 C4DCFC43331 for ; Tue, 31 Mar 2020 00:02:59 +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 8A96820771 for ; Tue, 31 Mar 2020 00:02:59 +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="gmtmYham" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8A96820771 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]:58372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJ4Mr-0005lw-Ms for qemu-devel@archiver.kernel.org; Mon, 30 Mar 2020 20:02:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35124) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJ4KX-0003iq-BI for qemu-devel@nongnu.org; Mon, 30 Mar 2020 20:00:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJ4KW-0007rI-0Y for qemu-devel@nongnu.org; Mon, 30 Mar 2020 20:00:33 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:29823) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jJ4KV-0007pL-S4 for qemu-devel@nongnu.org; Mon, 30 Mar 2020 20:00:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585612831; 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=e8r2fhQAUWWMfFuMYkpiyfEA0JVR82UbRr43Z9QMosI=; b=gmtmYham11K3INfnzezpqUnMgUDDrLUmOznj2DoZg589Mjg1jZoo7DPAjILFfhHLBLySTO WJpLM9701mF85WGKZ6FkJluLvnrIy1GK0fRVBQouLWIjGBYKnybXuGhmNeax3m8ak1bmIF H/13TACmw1KtaEUhDipjmwsTNYeUY/0= 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-90-FwL5ky_yOLuVQYod1DLsjA-1; Mon, 30 Mar 2020 20:00:29 -0400 X-MC-Unique: FwL5ky_yOLuVQYod1DLsjA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D849F18A5508; Tue, 31 Mar 2020 00:00:28 +0000 (UTC) Received: from probe.redhat.com (ovpn-113-210.rdu2.redhat.com [10.10.113.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1BC40100EBB6; Tue, 31 Mar 2020 00:00:25 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v10 02/14] iotests: don't use 'format' for drive_add Date: Mon, 30 Mar 2020 20:00:02 -0400 Message-Id: <20200331000014.11581-3-jsnow@redhat.com> In-Reply-To: <20200331000014.11581-1-jsnow@redhat.com> References: <20200331000014.11581-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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 , ehabkost@redhat.com, qemu-block@nongnu.org, armbru@redhat.com, Max Reitz , John Snow , philmd@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" It shadows (with a different type) the built-in format. Use something else. Signed-off-by: John Snow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Max Reitz --- tests/qemu-iotests/055 | 3 ++- tests/qemu-iotests/iotests.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/055 b/tests/qemu-iotests/055 index 82b9f5f47d..4175fff5e4 100755 --- a/tests/qemu-iotests/055 +++ b/tests/qemu-iotests/055 @@ -469,7 +469,8 @@ class TestDriveCompression(iotests.QMPTestCase): qemu_img('create', '-f', fmt, blockdev_target_img, str(TestDriveCompression.image_len), *args) if attach_target: - self.vm.add_drive(blockdev_target_img, format=3Dfmt, interface= =3D"none") + self.vm.add_drive(blockdev_target_img, + img_format=3Dfmt, interface=3D"none") =20 self.vm.launch() =20 diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 0641bbbc1f..a026d3343e 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -485,21 +485,21 @@ def add_drive_raw(self, opts): self._args.append(opts) return self =20 - def add_drive(self, path, opts=3D'', interface=3D'virtio', format=3Dim= gfmt): + def add_drive(self, path, opts=3D'', interface=3D'virtio', img_format= =3Dimgfmt): '''Add a virtio-blk drive to the VM''' options =3D ['if=3D%s' % interface, 'id=3Ddrive%d' % self._num_drives] =20 if path is not None: options.append('file=3D%s' % path) - options.append('format=3D%s' % format) + options.append('format=3D%s' % img_format) options.append('cache=3D%s' % cachemode) options.append('aio=3D%s' % aiomode) =20 if opts: options.append(opts) =20 - if format =3D=3D 'luks' and 'key-secret' not in opts: + if img_format =3D=3D 'luks' and 'key-secret' not in opts: # default luks support if luks_default_secret_object not in self._args: self.add_object(luks_default_secret_object) --=20 2.21.1