[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 7/7] iotests: Fix 051 output after qdev_init_nofail() removal
From: |
Kevin Wolf |
Subject: |
[PULL 7/7] iotests: Fix 051 output after qdev_init_nofail() removal |
Date: |
Fri, 3 Jul 2020 11:21:43 +0200 |
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>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20200616154949.6586-1-philmd@redhat.com>
Message-Id: <20200624140446.15380-2-alex.bennee@linaro.org>
Signed-off-by: Kevin Wolf <kwolf@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.25.4
- [PULL 0/7] Block layer patches, Kevin Wolf, 2020/07/03
- [PULL 1/7] qemu-img convert: Don't pre-zero images, Kevin Wolf, 2020/07/03
- [PULL 7/7] iotests: Fix 051 output after qdev_init_nofail() removal,
Kevin Wolf <=
- [PULL 2/7] qemu-storage-daemon: remember to add qemu_object_opts, Kevin Wolf, 2020/07/03
- [PULL 3/7] qemu-storage-daemon: add missing cleanup calls, Kevin Wolf, 2020/07/03
- [PULL 6/7] iotests.py: Do not wait() before communicate(), Kevin Wolf, 2020/07/03
- [PULL 4/7] vvfat: Check that updated filenames are valid, Kevin Wolf, 2020/07/03
- [PULL 5/7] vvfat: Fix array_remove_slice(), Kevin Wolf, 2020/07/03
- Re: [PULL 0/7] Block layer patches, no-reply, 2020/07/03
- Re: [PULL 0/7] Block layer patches, Peter Maydell, 2020/07/04