Commit 242c1721 authored by Alberto Garcia's avatar Alberto Garcia Committed by Kevin Wolf
Browse files

iotests: Update 051 and 186 after commit 14545097 



SCSI controllers are no longer created automatically for
-drive if=scsi, so this patch updates the tests that relied
on that.

Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent a03083a0

tests/qemu-iotests/051.pc.out

+0 −20
Original line number Diff line number Diff line
@@ -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

tests/qemu-iotests/186

+0 −4
Original line number Diff line number Diff line
@@ -133,10 +133,6 @@ check_info_block -drive if=ide,driver=null-co 
check_info_block -drive if=ide,media=cdrom

check_info_block -drive if=ide,driver=null-co,media=cdrom



check_info_block -drive if=scsi,driver=null-co

check_info_block -drive if=scsi,media=cdrom

check_info_block -drive if=scsi,driver=null-co,media=cdrom



check_info_block -drive if=virtio,driver=null-co



check_info_block -drive if=pflash,driver=null-co,size=1M

tests/qemu-iotests/186.out

+0 −28
Original line number Diff line number Diff line
@@ -442,34 +442,6 @@ ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only) 
    Cache mode:       writeback

(qemu) quit



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



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



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



Testing: -drive if=virtio,driver=null-co

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block