On 06.03.2018 17:45, Alberto Garcia wrote: > Signed-off-by: Alberto Garcia <be...@igalia.com> > --- > tests/qemu-iotests/051.pc.out | 20 -------------------- > tests/qemu-iotests/186.out | 22 +++------------------- > 2 files changed, 3 insertions(+), 39 deletions(-) > > diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out > index 830c11880a..b01f9a90d7 100644 > --- a/tests/qemu-iotests/051.pc.out > +++ b/tests/qemu-iotests/051.pc.out > @@ -117,20 +117,10 @@ Testing: -drive if=ide,media=cdrom > QEMU X.Y.Z monitor - type 'help' for more information > (qemu) quit > > -Testing: -drive if=scsi,media=cdrom > -QEMU X.Y.Z monitor - type 'help' for more information > -(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is > deprecated with this machine type > -quit > - > Testing: -drive if=ide > QEMU X.Y.Z monitor - type 'help' for more information > (qemu) QEMU_PROG: Initialization of device ide-hd failed: Device needs > media, but drive is empty > > -Testing: -drive if=scsi > -QEMU X.Y.Z monitor - type 'help' for more information > -(qemu) QEMU_PROG: -drive if=scsi: warning: bus=0,unit=0 is deprecated with > this machine type > -QEMU_PROG: -drive if=scsi: Device needs media, but drive is empty > - > Testing: -drive if=virtio > QEMU X.Y.Z monitor - type 'help' for more information > (qemu) QEMU_PROG: -drive if=virtio: Device needs media, but drive is empty > @@ -170,20 +160,10 @@ Testing: -drive > file=TEST_DIR/t.qcow2,if=ide,media=cdrom,readonly=on > QEMU X.Y.Z monitor - type 'help' for more information > (qemu) quit > > -Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on > -QEMU X.Y.Z monitor - type 'help' for more information > -(qemu) QEMU_PROG: -drive > file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on: warning: bus=0,unit=0 > is deprecated with this machine type > -quit > - > Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on > QEMU X.Y.Z monitor - type 'help' for more information > (qemu) QEMU_PROG: Initialization of device ide-hd failed: Block node is > read-only > > -Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on > -QEMU X.Y.Z monitor - type 'help' for more information > -(qemu) QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on: warning: > bus=0,unit=0 is deprecated with this machine type > -quit > - > Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on > QEMU X.Y.Z monitor - type 'help' for more information > (qemu) quit
Ack for that part. > diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out > index c8377fe146..d83bba1a88 100644 > --- a/tests/qemu-iotests/186.out > +++ b/tests/qemu-iotests/186.out > @@ -444,31 +444,15 @@ ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only) > > Testing: -drive if=scsi,driver=null-co > QEMU X.Y.Z monitor - type 'help' for more information > -(qemu) QEMU_PROG: -drive if=scsi,driver=null-co: warning: bus=0,unit=0 is > deprecated with this machine type > -info block > -scsi0-hd0 (NODE_NAME): null-co:// (null-co) > - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0] > - Cache mode: writeback > -(qemu) quit > +(qemu) QEMU_PROG: -drive if=scsi,driver=null-co: machine type does not > support if=scsi,bus=0,unit=0 > > Testing: -drive if=scsi,media=cdrom > QEMU X.Y.Z monitor - type 'help' for more information > -(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is > deprecated with this machine type > -info block > -scsi0-cd0: [not inserted] > - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0] > - Removable device: not locked, tray closed > -(qemu) quit > +(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: machine type does not support > if=scsi,bus=0,unit=0 > > Testing: -drive if=scsi,driver=null-co,media=cdrom > QEMU X.Y.Z monitor - type 'help' for more information > -(qemu) QEMU_PROG: -drive if=scsi,driver=null-co,media=cdrom: warning: > bus=0,unit=0 is deprecated with this machine type > -info block > -scsi0-cd0 (NODE_NAME): null-co:// (null-co, read-only) > - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0] > - Removable device: not locked, tray closed > - Cache mode: writeback > -(qemu) quit > +(qemu) QEMU_PROG: -drive if=scsi,driver=null-co,media=cdrom: machine type > does not support if=scsi,bus=0,unit=0 That rather sounds like this "if=scsi" test should be removed now? Thomas