From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 63/73] iotests: Fix 051's reference output
Date: Mon, 9 Mar 2015 16:41:48 +0100 [thread overview]
Message-ID: <1425915718-25138-4-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1425915718-25138-1-git-send-email-kwolf@redhat.com>
From: Max Reitz <mreitz@redhat.com>
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>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@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
--
1.8.3.1
next prev parent reply other threads:[~2015-03-09 15:42 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-09 15:41 [Qemu-devel] [PULL 00/73] Block patches Kevin Wolf
2015-03-09 15:41 ` [Qemu-devel] [PULL 22/73] qcow2: Helper function for refcount modification Kevin Wolf
2015-03-09 15:41 ` [Qemu-devel] [PULL 62/73] virtio-blk: Remove the stale FIXME comment Kevin Wolf
2015-03-09 15:41 ` Kevin Wolf [this message]
2015-03-09 15:41 ` [Qemu-devel] [PULL 64/73] iotests: Remove 006 Kevin Wolf
2015-03-09 15:41 ` [Qemu-devel] [PULL 65/73] iotests: Drop vpc from 004's and 104's format list Kevin Wolf
2015-03-09 15:41 ` [Qemu-devel] [PULL 66/73] block/vdi: Add locking for parallel requests Kevin Wolf
2015-03-09 15:41 ` [Qemu-devel] [PULL 67/73] scsi-hd: fix property unset case Kevin Wolf
2015-03-09 15:41 ` [Qemu-devel] [PULL 68/73] Add testcase for scsi-hd devices without drive property Kevin Wolf
2015-03-09 15:41 ` [Qemu-devel] [PULL 69/73] sheepdog: Fix misleading error messages in sd_snapshot_create() Kevin Wolf
2015-03-09 15:41 ` [Qemu-devel] [PULL 70/73] MAINTAINERS: Add jsnow as IDE maintainer Kevin Wolf
2015-03-09 15:41 ` [Qemu-devel] [PULL 71/73] block/raw-posix: fix launching with failed disks Kevin Wolf
2015-03-09 15:41 ` [Qemu-devel] [PULL 72/73] iotests: add O_DIRECT alignment probing test Kevin Wolf
2015-03-09 15:41 ` [Qemu-devel] [PULL 73/73] MAINTAINERS: Add jcody as blockjobs, block devices maintainer Kevin Wolf
2015-03-10 10:49 ` [Qemu-devel] [PULL 00/73] Block patches Peter Maydell
2015-03-10 11:00 ` Fam Zheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425915718-25138-4-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).