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

qemu-iotests: Fix reference output for 186 



Commits 70f17a15 ('error: Revert unwanted change of warning messages')
and e1824e58 ('qemu-iotests: Test 'info block'') had a semantic merge
conflict, which results in failure for qemu-iotests case 186. Fix the
reference output to consider the changes of 70f17a15.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Message-id: 1500973176-29235-1-git-send-email-kwolf@redhat.com
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent b6b75a99

tests/qemu-iotests/186.out

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

(qemu) quit



warning: qemu-system-x86_64: -drive if=scsi,driver=null-co: bus=0,unit=0 is deprecated with this machine type

qemu-system-x86_64: -drive if=scsi,driver=null-co: warning: bus=0,unit=0 is deprecated with this machine type

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

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

(qemu) info block
@@ -451,7 +451,7 @@ scsi0-hd0 (NODE_NAME): null-co:// (null-co) 
    Cache mode:       writeback

(qemu) quit



warning: qemu-system-x86_64: -drive if=scsi,media=cdrom: bus=0,unit=0 is deprecated with this machine type

qemu-system-x86_64: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type

Testing: -drive if=scsi,media=cdrom

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

(qemu) info block
@@ -460,7 +460,7 @@ scsi0-cd0: [not inserted] 
    Removable device: not locked, tray closed

(qemu) quit



warning: qemu-system-x86_64: -drive if=scsi,driver=null-co,media=cdrom: bus=0,unit=0 is deprecated with this machine type

qemu-system-x86_64: -drive if=scsi,driver=null-co,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type

Testing: -drive if=scsi,driver=null-co,media=cdrom

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

(qemu) info block