Re: [Qemu-devel] [PATCH v2 3/9] qemu-iotests: Add qemu-io format option in Python tests

[Kevin Wolf]

Am 10.11.2014 um 15:29 hat Max Reitz geschrieben:
> On 2014-11-07 at 20:39, Kevin Wolf wrote:
> >Signed-off-by: Kevin Wolf <address@hidden>
> >---
> >  tests/qemu-iotests/030 | 22 +++++++++++-----------
> >  tests/qemu-iotests/040 | 32 ++++++++++++++++----------------
> >  tests/qemu-iotests/055 | 18 +++++++++---------
> >  3 files changed, 36 insertions(+), 36 deletions(-)
> >
> >diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
> >index 8ce2373..952a524 100755
> >--- a/tests/qemu-iotests/030
> >+++ b/tests/qemu-iotests/030
> >@@ -34,7 +34,7 @@ class TestSingleDrive(iotests.QMPTestCase):
> >          iotests.create_image(backing_img, TestSingleDrive.image_len)
> >          qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' % 
> > backing_img, mid_img)
> >          qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' % 
> > mid_img, test_img)
> >-        qemu_io('-c', 'write -P 0x1 0 512', backing_img)
> >+        qemu_io('-f', 'raw', '-c', 'write -P 0x1 0 512', backing_img)
> >          self.vm = iotests.VM().add_drive("blkdebug::" + test_img)
> >          self.vm.launch()
> >@@ -55,8 +55,8 @@ class TestSingleDrive(iotests.QMPTestCase):
> >          self.assert_no_active_block_jobs()
> >          self.vm.shutdown()
> >-        self.assertEqual(qemu_io('-c', 'map', backing_img),
> >-                         qemu_io('-c', 'map', test_img),
> >+        self.assertEqual(qemu_io('-f', 'raw', '-c', 'map', backing_img),
> >+                         qemu_io('-f', iotests.imgfmt, '-c', 'map', 
> >test_img),
> >                           'image file map does not match backing file after 
> > streaming')
> >      def test_stream_pause(self):
> >@@ -86,8 +86,8 @@ class TestSingleDrive(iotests.QMPTestCase):
> >          self.assert_no_active_block_jobs()
> >          self.vm.shutdown()
> >-        self.assertEqual(qemu_io('-c', 'map', backing_img),
> >-                         qemu_io('-c', 'map', test_img),
> >+        self.assertEqual(qemu_io('-f', 'raw', '-c', 'map', backing_img),
> >+                         qemu_io('-f', iotests.imgfmt, '-c', 'map', 
> >test_img),
> >                           'image file map does not match backing file after 
> > streaming')
> >      def test_stream_partial(self):
> >@@ -101,8 +101,8 @@ class TestSingleDrive(iotests.QMPTestCase):
> >          self.assert_no_active_block_jobs()
> >          self.vm.shutdown()
> >-        self.assertEqual(qemu_io('-c', 'map', mid_img),
> >-                         qemu_io('-c', 'map', test_img),
> >+        self.assertEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', 
> >mid_img),
> >+                         qemu_io('-f', iotests.imgfmt, '-c', 'map', 
> >test_img),
> >                           'image file map does not match backing file after 
> > streaming')
> >      def test_device_not_found(self):
> >@@ -359,9 +359,9 @@ class TestStreamStop(iotests.QMPTestCase):
> >      def setUp(self):
> >          qemu_img('create', backing_img, str(TestStreamStop.image_len))
> 
> I would have most certainly not opposed to adding -f raw here as well.

qemu-img is a different story. Would probably be nice to add -f raw
there, but then, there's no real reason to do it either.

The only reason why I'm adding it to the qemu-io calls is that after
patch 7 each of the fixed calls would print a warning.

Kevin