qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 01/17] iotests: Update 051's reference output
Date: Mon, 16 Mar 2015 17:57:05 +0100	[thread overview]
Message-ID: <1426525041-21926-2-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1426525041-21926-1-git-send-email-kwolf@redhat.com>

From: Markus Armbruster <armbru@redhat.com>

Commit c4bacaf improved error reporting, but neglected to update
051.out.  Commit 2726958 tried to redress, but didn't get it quite
right (punctuation difference), and shortly after commit
ae071cc..master improved error reporting some more, neglecting 051.out
some more.  Sorry!

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/051.out | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
index 09895e6..2890eac 100644
--- a/tests/qemu-iotests/051.out
+++ b/tests/qemu-iotests/051.out
@@ -128,13 +128,11 @@ 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
 (qemu) QEMU_PROG: -drive if=virtio: Device needs media, but drive is empty
-QEMU_PROG: -drive if=virtio: Device initialization failed.
 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: Initialization of device lsi53c895a failed: Device initialization failed.
+(qemu) QEMU_PROG: Initialization of device lsi53c895a failed: Device needs media, but drive is empty
 
 Testing: -drive if=none,id=disk -device ide-cd,drive=disk
 QEMU X.Y.Z monitor - type 'help' for more information
-- 
1.8.3.1

  reply	other threads:[~2015-03-16 16:57 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-16 16:57 [Qemu-devel] [PULL 00/17] Block patches for 2.3.0-rc0 Kevin Wolf
2015-03-16 16:57 ` Kevin Wolf [this message]
2015-03-16 16:57 ` [Qemu-devel] [PULL 02/17] qemu-img: Fix convert, amend error messages for unknown options Kevin Wolf
2015-03-16 16:57 ` [Qemu-devel] [PULL 03/17] block: Deprecate QCOW/QCOW2 encryption Kevin Wolf
2015-03-16 16:57 ` [Qemu-devel] [PULL 04/17] block: Fix block-set-write-threshold not to use funky error class Kevin Wolf
2015-03-16 16:57 ` [Qemu-devel] [PULL 05/17] qemu-img: Avoid qerror_report_err() outside QMP handlers, again Kevin Wolf
2015-03-16 16:57 ` [Qemu-devel] [PULL 06/17] qcow2: Respect new_block in alloc_refcount_block() Kevin Wolf
2015-03-16 16:57 ` [Qemu-devel] [PULL 07/17] iotests: Add tests for refcount table growth Kevin Wolf
2015-03-16 16:57 ` [Qemu-devel] [PULL 08/17] iotests: Test non-self-referential qcow2 refblocks Kevin Wolf
2015-03-16 16:57 ` [Qemu-devel] [PULL 09/17] monitor: Convert bdrv_find to blk_by_name Kevin Wolf
2015-03-16 16:57 ` [Qemu-devel] [PULL 10/17] migration: " Kevin Wolf
2015-03-16 16:57 ` [Qemu-devel] [PULL 11/17] blockdev: " Kevin Wolf
2015-03-16 16:57 ` [Qemu-devel] [PULL 12/17] block: Drop bdrv_find Kevin Wolf
2015-03-16 16:57 ` [Qemu-devel] [PULL 13/17] block/vpc: optimize vpc_co_get_block_status Kevin Wolf
2015-03-16 16:57 ` [Qemu-devel] [PULL 14/17] vpc: Ignore geometry for large images Kevin Wolf
2015-03-16 16:57 ` [Qemu-devel] [PULL 15/17] block/vpc: make calculate_geometry spec conform Kevin Wolf
2015-03-16 16:57 ` [Qemu-devel] [PULL 16/17] block/vpc: rename footer->size -> footer->current_size Kevin Wolf
2015-03-16 16:57 ` [Qemu-devel] [PULL 17/17] block/vpc: remove disabled code from get_sector_offset Kevin Wolf
2015-03-17 10:25 ` [Qemu-devel] [PULL 00/17] Block patches for 2.3.0-rc0 Peter Maydell

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=1426525041-21926-2-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).