From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PULL 17/18] iotests: Fix 051 output after qdev_init_nofail() removal
Date: Mon, 22 Jun 2020 17:10:58 +0200 [thread overview]
Message-ID: <20200622151059.921191-18-mreitz@redhat.com> (raw)
In-Reply-To: <20200622151059.921191-1-mreitz@redhat.com>
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Commit 96927c744 replaced qdev_init_nofail() call by
isa_realize_and_unref() which has a different error
message. Update the test output accordingly.
Gitlab CI error after merging b77b5b3dc7:
https://gitlab.com/qemu-project/qemu/-/jobs/597414772#L4375
Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200616154949.6586-1-philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/051.pc.out | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out
index 0ea80d35f0..da8ad87187 100644
--- a/tests/qemu-iotests/051.pc.out
+++ b/tests/qemu-iotests/051.pc.out
@@ -142,7 +142,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: Initialization of device ide-hd failed: Device needs media, but drive is empty
+(qemu) QEMU_PROG: Device needs media, but drive is empty
Testing: -drive if=virtio
QEMU X.Y.Z monitor - type 'help' for more information
@@ -214,7 +214,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: Initialization of device ide-hd failed: Block node is read-only
+(qemu) QEMU_PROG: Block node is read-only
Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on
QEMU X.Y.Z monitor - type 'help' for more information
--
2.26.2
next prev parent reply other threads:[~2020-06-22 15:25 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-22 15:10 [PULL 00/18] Block patches Max Reitz
2020-06-22 15:10 ` [PULL 01/18] iotests: Make _filter_img_create more active Max Reitz
2020-06-22 15:10 ` [PULL 02/18] iotests: filter few more luks specific create options Max Reitz
2020-06-22 15:10 ` [PULL 03/18] block/block-copy: block_copy_dirty_clusters: fix failure check Max Reitz
2020-06-22 15:10 ` [PULL 04/18] qcrypto/core: add generic infrastructure for crypto options amendment Max Reitz
2020-06-22 15:10 ` [PULL 05/18] qcrypto/luks: implement encryption key management Max Reitz
2020-06-22 15:10 ` [PULL 06/18] block/amend: add 'force' option Max Reitz
2020-06-22 15:10 ` [PULL 07/18] block/amend: separate amend and create options for qemu-img Max Reitz
2020-06-22 15:10 ` [PULL 08/18] block/amend: refactor qcow2 amend options Max Reitz
2020-06-22 15:10 ` [PULL 09/18] block/crypto: rename two functions Max Reitz
2020-06-22 15:10 ` [PULL 10/18] block/crypto: implement the encryption key management Max Reitz
2020-06-22 15:10 ` [PULL 11/18] block/qcow2: extend qemu-img amend interface with crypto options Max Reitz
2020-06-22 15:10 ` [PULL 12/18] iotests: qemu-img tests for luks key management Max Reitz
2020-06-22 15:10 ` [PULL 13/18] block/core: add generic infrastructure for x-blockdev-amend qmp command Max Reitz
2020-06-22 15:10 ` [PULL 14/18] block/crypto: implement blockdev-amend Max Reitz
2020-06-22 15:10 ` [PULL 15/18] block/qcow2: " Max Reitz
2020-06-22 15:10 ` [PULL 16/18] iotests: add tests for blockdev-amend Max Reitz
2020-06-22 15:10 ` Max Reitz [this message]
2020-06-22 15:10 ` [PULL 18/18] iotests: don't test qcow2.py inside 291 Max Reitz
2020-06-22 19:29 ` [PULL 00/18] Block patches no-reply
2020-06-23 12:55 ` Peter Maydell
2020-06-24 7:27 ` Max Reitz
2020-06-24 9:06 ` Thomas Huth
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=20200622151059.921191-18-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.