diff mbox

iotests: Fix 051's reference output

Message ID 1425393512-10572-1-git-send-email-mreitz@redhat.com
State New
Headers show

Commit Message

Max Reitz March 3, 2015, 2:38 p.m. UTC 
Commit c4bacafb717de55538311b80a185ce9166b8daa2 changed (improved)
qdev_init_nofail()'s error reporting, which affects iotest 051. Fix the
reference output.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/051.out | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Comments

Markus Armbruster March 4, 2015, 7:34 a.m. UTC | #1 
Max Reitz <mreitz@redhat.com> writes:

> Commit c4bacafb717de55538311b80a185ce9166b8daa2 changed (improved)
> qdev_init_nofail()'s error reporting, which affects iotest 051. Fix the
> reference output.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>

I apologize for neglecting to run iotests.  Lost sight of it while
rambling around in qdevistan.

Reviewed-by: Markus Armbruster <armbru@redhat.com>
Kevin Wolf March 4, 2015, 9:58 a.m. UTC | #2 
Am 03.03.2015 um 15:38 hat Max Reitz geschrieben:
> Commit c4bacafb717de55538311b80a185ce9166b8daa2 changed (improved)
> qdev_init_nofail()'s error reporting, which affects iotest 051. Fix the
> reference output.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>

Thanks, applied to the block branch.

Kevin
diff mbox

Patch

diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
index bf52bf0..88add8f 100644
--- a/tests/qemu-iotests/051.out
+++ b/tests/qemu-iotests/051.out
@@ -115,8 +115,7 @@  QEMU X.Y.Z monitor - type 'help' for more information
 Testing: -drive if=ide
 QEMU X.Y.Z monitor - type 'help' for more information
 (qemu) QEMU_PROG: Device needs media, but drive is empty
-QEMU_PROG: Device initialization failed.
-QEMU_PROG: Initialization of device ide-hd failed
+QEMU_PROG: Initialization of device ide-hd failed: Device initialization failed.
 
 Testing: -drive if=virtio
 QEMU X.Y.Z monitor - type 'help' for more information
@@ -127,8 +126,7 @@  QEMU_PROG: -drive if=virtio: Device 'virtio-blk-pci' could not be initialized
 Testing: -drive if=scsi
 QEMU X.Y.Z monitor - type 'help' for more information
 (qemu) QEMU_PROG: -drive if=scsi: Device needs media, but drive is empty
-QEMU_PROG: Device initialization failed.
-QEMU_PROG: Initialization of device lsi53c895a failed
+QEMU_PROG: Initialization of device lsi53c895a failed: Device initialization failed.
 
 Testing: -drive if=none,id=disk -device ide-cd,drive=disk
 QEMU X.Y.Z monitor - type 'help' for more information
@@ -178,8 +176,7 @@  QEMU X.Y.Z monitor - type 'help' for more information
 Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on
 QEMU X.Y.Z monitor - type 'help' for more information
 (qemu) QEMU_PROG: Can't use a read-only drive
-QEMU_PROG: Device initialization failed.
-QEMU_PROG: Initialization of device ide-hd failed
+QEMU_PROG: Initialization of device ide-hd failed: Device initialization failed.
 
 Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on
 QEMU X.Y.Z monitor - type 'help' for more information