82 lines
3.1 KiB
Diff
82 lines
3.1 KiB
Diff
|
From 127360c2fa0fefa18ff828bfec3985e04791d665 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
Date: Wed, 3 Jun 2020 16:03:16 +0100
|
||
|
|
Subject: [PATCH 17/26] iotests: don't use 'format' for drive_add
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
Message-id: <20200603160325.67506-3-kwolf@redhat.com>
|
||
|
|
Patchwork-id: 97102
|
||
|
|
O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH v2 02/11] iotests: don't use 'format' for drive_add
|
||
|
|
Bugzilla: 1778593
|
||
|
|
RH-Acked-by: Eric Blake <eblake@redhat.com>
|
||
|
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
||
|
|
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
||
|
|
|
||
|
|
From: John Snow <jsnow@redhat.com>
|
||
|
|
|
||
|
|
It shadows (with a different type) the built-in format.
|
||
|
|
Use something else.
|
||
|
|
|
||
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
||
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
||
|
|
Message-Id: <20200331000014.11581-3-jsnow@redhat.com>
|
||
|
|
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
||
|
|
(cherry picked from commit 1d3d4b630c6ea8b19420c097f0c448b6ded95072)
|
||
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
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 c732a11..eb50c9f 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=fmt, interface="none")
|
||
|
|
+ self.vm.add_drive(blockdev_target_img,
|
||
|
|
+ img_format=fmt, interface="none")
|
||
|
|
|
||
|
|
self.vm.launch()
|
||
|
|
|
||
|
|
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
|
||
|
|
index 46f880c..be20d56 100644
|
||
|
|
--- a/tests/qemu-iotests/iotests.py
|
||
|
|
+++ b/tests/qemu-iotests/iotests.py
|
||
|
|
@@ -481,20 +481,20 @@ class VM(qtest.QEMUQtestMachine):
|
||
|
|
self._args.append(opts)
|
||
|
|
return self
|
||
|
|
|
||
|
|
- def add_drive(self, path, opts='', interface='virtio', format=imgfmt):
|
||
|
|
+ def add_drive(self, path, opts='', interface='virtio', img_format=imgfmt):
|
||
|
|
'''Add a virtio-blk drive to the VM'''
|
||
|
|
options = ['if=%s' % interface,
|
||
|
|
'id=drive%d' % self._num_drives]
|
||
|
|
|
||
|
|
if path is not None:
|
||
|
|
options.append('file=%s' % path)
|
||
|
|
- options.append('format=%s' % format)
|
||
|
|
+ options.append('format=%s' % img_format)
|
||
|
|
options.append('cache=%s' % cachemode)
|
||
|
|
|
||
|
|
if opts:
|
||
|
|
options.append(opts)
|
||
|
|
|
||
|
|
- if format == 'luks' and 'key-secret' not in opts:
|
||
|
|
+ if img_format == '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)
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|