diff mbox series

[v2,01/25] iotests: Fix 051 output after qdev_init_nofail() removal

Message ID 20200624140446.15380-2-alex.bennee@linaro.org
State Superseded
Headers show
Series testing/next (vm, gitlab, docker) | expand

Commit Message

Alex Bennée June 24, 2020, 2:04 p.m. UTC 
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>
---
 tests/qemu-iotests/051.pc.out | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.20.1

Comments

Kevin Wolf July 3, 2020, 8:07 a.m. UTC | #1 
Am 24.06.2020 um 16:04 hat Alex Bennée geschrieben:
> 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>


Thanks, applied (this individual patch) to the block branch.

Kevin
Max Reitz July 3, 2020, 9:52 a.m. UTC | #2 
On 03.07.20 10:07, Kevin Wolf wrote:
> Am 24.06.2020 um 16:04 hat Alex Bennée geschrieben:

>> 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>

> 

> Thanks, applied (this individual patch) to the block branch.


Hm, I’ve already included it in my pull request from last week:

https://lists.nongnu.org/archive/html/qemu-block/2020-06/msg01159.html

Unfortunately, the request got no response so far.

Max
Alex Bennée July 3, 2020, 10:02 a.m. UTC | #3 
Max Reitz <mreitz@redhat.com> writes:

> On 03.07.20 10:07, Kevin Wolf wrote:

>> Am 24.06.2020 um 16:04 hat Alex Bennée geschrieben:

>>> 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>

>> 

>> Thanks, applied (this individual patch) to the block branch.

>

> Hm, I’ve already included it in my pull request from last week:

>

> https://lists.nongnu.org/archive/html/qemu-block/2020-06/msg01159.html

>

> Unfortunately, the request got no response so far.


I think Peter's been on holiday this week so I guess there will be a
pile of PRs to process next week. I'll probably cut mine Monday
afternoon to post on Tuesday.

-- 
Alex Bennée
Max Reitz July 3, 2020, 10:12 a.m. UTC | #4 
On 03.07.20 12:02, Alex Bennée wrote:
> 

> Max Reitz <mreitz@redhat.com> writes:

> 

>> On 03.07.20 10:07, Kevin Wolf wrote:

>>> Am 24.06.2020 um 16:04 hat Alex Bennée geschrieben:

>>>> 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>

>>>

>>> Thanks, applied (this individual patch) to the block branch.

>>

>> Hm, I’ve already included it in my pull request from last week:

>>

>> https://lists.nongnu.org/archive/html/qemu-block/2020-06/msg01159.html

>>

>> Unfortunately, the request got no response so far.

> 

> I think Peter's been on holiday this week so I guess there will be a

> pile of PRs to process next week.


It looked to me like he responded to some pull requests this week, so,
well...  I don’t know.
Kevin Wolf July 3, 2020, 12:14 p.m. UTC | #5 
Am 03.07.2020 um 11:52 hat Max Reitz geschrieben:
> On 03.07.20 10:07, Kevin Wolf wrote:

> > Am 24.06.2020 um 16:04 hat Alex Bennée geschrieben:

> >> 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>

> > 

> > Thanks, applied (this individual patch) to the block branch.

> 

> Hm, I’ve already included it in my pull request from last week:

> 

> https://lists.nongnu.org/archive/html/qemu-block/2020-06/msg01159.html

> 

> Unfortunately, the request got no response so far.


I see. But as long as the patch is present in unchanged form in both
trees, git will sort it out.

Kevin
diff mbox series

Patch

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