Message ID | 20180212124718.21935-1-mreitz@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 02/12/2018 01:47 PM, Max Reitz wrote: > 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: Christian Borntraeger <borntraeger@de.ibm.com> > Signed-off-by: Max Reitz <mreitz@redhat.com> Tested-by: Christian Borntraeger <borntraeger@de.ibm.com> > --- > tests/qemu-iotests/155 | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/tests/qemu-iotests/155 b/tests/qemu-iotests/155 > index fc9fa975be..42dae04c83 100755 > --- a/tests/qemu-iotests/155 > +++ b/tests/qemu-iotests/155 > @@ -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', >
Am 12.02.2018 um 13:47 hat Max Reitz geschrieben: > 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: Christian Borntraeger <borntraeger@de.ibm.com> > Signed-off-by: Max Reitz <mreitz@redhat.com> Thanks, applied to the block branch. Kevin
diff --git a/tests/qemu-iotests/155 b/tests/qemu-iotests/155 index fc9fa975be..42dae04c83 100755 --- a/tests/qemu-iotests/155 +++ b/tests/qemu-iotests/155 @@ -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',
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: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/155 | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)