* [Qemu-devel] [PATCH] iotests: Fix 051's reference output
@ 2015-03-03 14:38 Max Reitz
2015-03-04 7:34 ` Markus Armbruster
2015-03-04 9:58 ` Kevin Wolf
0 siblings, 2 replies; 3+ messages in thread
From: Max Reitz @ 2015-03-03 14:38 UTC (permalink / raw)
To: qemu-block
Cc: Kevin Wolf, Max Reitz, qemu-devel, Stefan Hajnoczi,
Markus Armbruster
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(-)
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
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] iotests: Fix 051's reference output
2015-03-03 14:38 [Qemu-devel] [PATCH] iotests: Fix 051's reference output Max Reitz
@ 2015-03-04 7:34 ` Markus Armbruster
2015-03-04 9:58 ` Kevin Wolf
1 sibling, 0 replies; 3+ messages in thread
From: Markus Armbruster @ 2015-03-04 7:34 UTC (permalink / raw)
To: Max Reitz; +Cc: Kevin Wolf, Stefan Hajnoczi, qemu-devel, qemu-block
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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] iotests: Fix 051's reference output
2015-03-03 14:38 [Qemu-devel] [PATCH] iotests: Fix 051's reference output Max Reitz
2015-03-04 7:34 ` Markus Armbruster
@ 2015-03-04 9:58 ` Kevin Wolf
1 sibling, 0 replies; 3+ messages in thread
From: Kevin Wolf @ 2015-03-04 9:58 UTC (permalink / raw)
To: Max Reitz; +Cc: Stefan Hajnoczi, qemu-devel, qemu-block, Markus Armbruster
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-04 9:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-03 14:38 [Qemu-devel] [PATCH] iotests: Fix 051's reference output Max Reitz
2015-03-04 7:34 ` Markus Armbruster
2015-03-04 9:58 ` Kevin Wolf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).