From nobody Thu Nov 13 22:02:57 2025 Delivered-To: importer@patchew.org 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+importer=patchew.org@nongnu.org; helo=lists.gnu.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+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582762425; cv=none; d=zohomail.com; s=zohoarc; b=h955CN/NdaUyZ2lwWnf7zsJtrSjXhdfHnPWdmogzOoZJ03556JCgR+/DER0kzGIBJ7+Vs2x1lTorIPNLoU0s/TJMcpGi4h82cgvcbz2pnoVXUSBKJpkvE8L2tlq/eLE4bAKq6iH8+UDuUzTGAHNh7n9oISn7MlRmy2fyaAuaPB8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582762425; 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=4oPJhfkI0aRGGAECXKuAWDJVkZzi1afNH0v3JIceBRE=; b=k0QBZAjwQk8ZTYC9N9NHIeNX++3EKfdAVa7sDwFUHv4DIYFbJyJxbSin3rXg0f9SkmIOZ9fRVp94Xz1vCYhXyth773didrnDjgo+SRTHvkA8Z3D+sjUj0N22IzPM2CeQKW8d/y/86UKAR4nY755JPFBjyCxVQpILjCi/4XW/Tgs= 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+importer=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 1582762425195867.2550464865824; Wed, 26 Feb 2020 16:13:45 -0800 (PST) Received: from localhost ([::1]:52056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j76oB-0006bo-EU for importer@patchew.org; Wed, 26 Feb 2020 19:13:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43359) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j76hc-0004w9-58 for qemu-devel@nongnu.org; Wed, 26 Feb 2020 19:06:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j76hb-000642-2P for qemu-devel@nongnu.org; Wed, 26 Feb 2020 19:06:56 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:41472 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j76ha-000635-Uw for qemu-devel@nongnu.org; Wed, 26 Feb 2020 19:06:55 -0500 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-185-ilqkU8zhMEigNxUy8-w1pQ-1; Wed, 26 Feb 2020 19:06:51 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EDF631005514; Thu, 27 Feb 2020 00:06:49 +0000 (UTC) Received: from probe.redhat.com (ovpn-123-58.rdu2.redhat.com [10.10.123.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7038A390; Thu, 27 Feb 2020 00:06:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582762014; 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=4oPJhfkI0aRGGAECXKuAWDJVkZzi1afNH0v3JIceBRE=; b=RzPoKAff0zWW5fN0hSrIbjjqTTu2dJ4ZNcqFVT/bunWSmQDsQXUIyzJwYa6tPFUMnJFYD0 nVU44HhOw28uiK8mNW6xEMLCyhEKXXefXWeHojExhXZBsn4FBy+FxbBe4HQXtSdqT4A6Tz Xzo/FB5IIb2glfkNPC8OO5WwC1AqBEc= X-MC-Unique: ilqkU8zhMEigNxUy8-w1pQ-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v6 8/9] iotests: don't use 'format' for drive_add Date: Wed, 26 Feb 2020 19:06:38 -0500 Message-Id: <20200227000639.9644-9-jsnow@redhat.com> In-Reply-To: <20200227000639.9644-1-jsnow@redhat.com> References: <20200227000639.9644-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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 , John Snow , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" It shadows (with a different type) the built-in format. Use something else. Signed-off-by: John Snow Reviewed-by: Max Reitz Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 214f59995e..8bf640c632 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -492,21 +492,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