Commit 2782bb75 authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

iotests: Use virtio-blk in 155 



Only a few select machine types support floppy drives and there is
actually nothing preventing us from using virtio here, so let's do it.

Reported-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Tested-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent cb2af917

tests/qemu-iotests/155

+9 −5
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ class BaseClass(iotests.QMPTestCase): 
                    'file': {'driver': 'file',

                             'filename': source_img}}

        self.vm.add_blockdev(self.qmp_to_opts(blockdev))

        self.vm.add_device('floppy,id=qdev0,drive=source')

        self.vm.add_device('virtio-blk,id=qdev0,drive=source')

        self.vm.launch()



        self.assertIntactSourceBackingChain()
@@ -173,21 +173,24 @@ class MirrorBaseClass(BaseClass): 
    def testFull(self):

        self.runMirror('full')



        node = self.findBlockNode('target', 'qdev0')

        node = self.findBlockNode('target',

                                  '/machine/peripheral/qdev0/virtio-backend')

        self.assertCorrectBackingImage(node, None)

        self.assertIntactSourceBackingChain()



    def testTop(self):

        self.runMirror('top')



        node = self.findBlockNode('target', 'qdev0')

        node = self.findBlockNode('target',

                                  '/machine/peripheral/qdev0/virtio-backend')

        self.assertCorrectBackingImage(node, back2_img)

        self.assertIntactSourceBackingChain()



    def testNone(self):

        self.runMirror('none')



        node = self.findBlockNode('target', 'qdev0')

        node = self.findBlockNode('target',

                                  '/machine/peripheral/qdev0/virtio-backend')

        self.assertCorrectBackingImage(node, source_img)

        self.assertIntactSourceBackingChain()
@@ -239,7 +242,8 @@ class TestCommit(BaseClass): 


        self.vm.event_wait('BLOCK_JOB_COMPLETED')



        node = self.findBlockNode(None, 'qdev0')

        node = self.findBlockNode(None,

                                  '/machine/peripheral/qdev0/virtio-backend')

        self.assert_qmp(node, 'image' + '/backing-image' * 0 + '/filename',

                        back1_img)

        self.assert_qmp(node, 'image' + '/backing-image' * 1 + '/filename',