qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, "Kevin Wolf" <kwolf@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	berrange@redhat.com,
	"open list:Block layer core" <qemu-block@nongnu.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	richard.henderson@linaro.org, f4bug@amsat.org,
	"Max Reitz" <mreitz@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	cota@braap.org, aurelien@aurel32.net
Subject: [PATCH v1 01/18] iotests: Fix 051 output after qdev_init_nofail() removal
Date: Mon, 22 Jun 2020 15:31:47 +0100	[thread overview]
Message-ID: <20200622143204.12921-2-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200622143204.12921-1-alex.bennee@linaro.org>

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>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200616154949.6586-1-philmd@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 0ea80d35f0e..da8ad871876 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.20.1



  reply	other threads:[~2020-06-22 14:35 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-22 14:31 [PATCH v1 00/18] testing/next (vm, gitlab) Alex Bennée
2020-06-22 14:31 ` Alex Bennée [this message]
2020-06-22 17:52   ` [PATCH v1 01/18] iotests: Fix 051 output after qdev_init_nofail() removal John Snow
2020-06-22 17:57     ` Philippe Mathieu-Daudé
2020-06-22 18:23     ` Alex Bennée
2020-06-22 14:31 ` [PATCH v1 02/18] tests/vm: pass args through to BaseVM's __init__ Alex Bennée
2020-06-22 14:31 ` [PATCH v1 03/18] tests/vm: Add configuration to basevm.py Alex Bennée
2020-06-22 14:31 ` [PATCH v1 04/18] tests/vm: Added configuration file support Alex Bennée
2020-06-22 14:31 ` [PATCH v1 05/18] tests/vm: Add common Ubuntu python module Alex Bennée
2020-06-22 14:31 ` [PATCH v1 06/18] tests/vm: Added a new script for ubuntu.aarch64 Alex Bennée
2020-06-22 14:31 ` [PATCH v1 07/18] tests/vm: Added a new script for centos.aarch64 Alex Bennée
2020-06-22 14:31 ` [PATCH v1 08/18] tests/vm: change scripts to use self._config Alex Bennée
2020-06-22 14:31 ` [PATCH v1 09/18] python/qemu: Add ConsoleSocket for optional use in QEMUMachine Alex Bennée
2020-06-22 14:31 ` [PATCH v1 10/18] tests/vm: Add workaround to consume console Alex Bennée
2020-06-22 14:31 ` [PATCH v1 11/18] tests/vm: switch from optsparse to argparse Alex Bennée
2020-06-22 17:11   ` Robert Foley
2020-06-22 17:20   ` Daniel P. Berrangé
2020-06-22 14:31 ` [PATCH v1 12/18] tests/vm: allow us to take advantage of MTTCG Alex Bennée
2020-06-22 14:52   ` Robert Foley
2020-06-26 18:30   ` Richard Henderson
2020-06-26 19:37     ` Alex Bennée
2020-06-29 14:41     ` Alex Bennée
2020-06-29 14:45       ` Philippe Mathieu-Daudé
2020-06-22 14:31 ` [PATCH v1 13/18] tests/docker: check for an parameters not empty string Alex Bennée
2020-06-22 14:46   ` Philippe Mathieu-Daudé
2020-06-29 16:15   ` Eric Blake
2020-06-22 14:32 ` [PATCH v1 14/18] .gitignore: un-ignore .gitlab-ci.d Alex Bennée
2020-06-22 16:29   ` Daniel P. Berrangé
2020-06-22 14:32 ` [PATCH v1 15/18] .gitlab: add acceptance testing to system builds Alex Bennée
2020-06-22 14:32 ` [PATCH v1 16/18] .gitlab: split fedora-misc-disabled Alex Bennée
2020-06-22 14:32 ` [PATCH v1 17/18] .gitlab: tag remaining jobs as builds Alex Bennée
2020-06-22 14:32 ` [PATCH v1 18/18] .gitlab: add avocado asset caching Alex Bennée
2020-06-22 14:45   ` Philippe Mathieu-Daudé

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=20200622143204.12921-2-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=aurelien@aurel32.net \
    --cc=berrange@redhat.com \
    --cc=cota@braap.org \
    --cc=f4bug@amsat.org \
    --cc=fam@euphon.net \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=thuth@redhat.com \
    /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).