From: Max Reitz <mreitz@redhat.com>
Date: Tue, 18 Feb 2020 10:34:39 +0000 (+0100)
Subject: iotests: Let 041 use -blockdev for quorum children
X-Git-Tag: v5.0.0-rc0~85^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f718ca147dad5b03b4cb75952966e59e34616382;p=thirdparty%2Fqemu.git

iotests: Let 041 use -blockdev for quorum children

Using -drive with default options means that a virtio-blk drive will be
created that has write access to the to-be quorum children.  Quorum
should have exclusive write access to them, so we should use -blockdev
instead.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200218103454.296704-5-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
index 43556b97273..aa7d54d968b 100755
--- a/tests/qemu-iotests/041
+++ b/tests/qemu-iotests/041
@@ -885,7 +885,10 @@ class TestRepairQuorum(iotests.QMPTestCase):
             # Assign a node name to each quorum image in order to manipulate
             # them
             opts = "node-name=img%i" % self.IMAGES.index(i)
-            self.vm = self.vm.add_drive(i, opts)
+            opts += ',driver=%s' % iotests.imgfmt
+            opts += ',file.driver=file'
+            opts += ',file.filename=%s' % i
+            self.vm = self.vm.add_blockdev(opts)
 
         self.vm.launch()