[Qemu-commits] [qemu/qemu] e11543: iotests: Fix 051 output after qdev_init_nofail() r...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: e11543c53fed2634146b9223112bc5c941434607
      
https://github.com/qemu/qemu/commit/e11543c53fed2634146b9223112bc5c941434607
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-06-24 (Wed, 24 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/051.pc.out

  Log Message:
  -----------
  iotests: Fix 051 output after qdev_init_nofail() removal

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>


  Commit: 24b861c0386a17ea31eb824310c21118fb7be883
      
https://github.com/qemu/qemu/commit/24b861c0386a17ea31eb824310c21118fb7be883
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2020-06-24 (Wed, 24 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/291
    M tests/qemu-iotests/291.out

  Log Message:
  -----------
  iotests: don't test qcow2.py inside 291

820c6bee534ec3b added testing of qcow2.py into 291, and it breaks 291
with external data file. Actually, 291 is bad place for qcow2.py
testing, better add a separate test.

For now, drop qcow2.py testing from 291 to fix the regression.

Fixes: 820c6bee534ec3b
Reported-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200618154052.8629-1-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 4abf70a661a5df3886ac9d7c19c3617fa92b922a
      
https://github.com/qemu/qemu/commit/4abf70a661a5df3886ac9d7c19c3617fa92b922a
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-07-03 (Fri, 03 Jul 2020)

  Changed paths:
    M tests/qemu-iotests/051.pc.out
    M tests/qemu-iotests/291
    M tests/qemu-iotests/291.out

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2020-06-24' 
into staging

Block patches:
- Two iotest fixes

# gpg: Signature made Wed 24 Jun 2020 09:00:51 BST
# gpg:                using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40
# gpg:                issuer "mreitz@redhat.com"
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>" [full]
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/maxreitz/tags/pull-block-2020-06-24:
  iotests: don't test qcow2.py inside 291
  iotests: Fix 051 output after qdev_init_nofail() removal

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/6651620b92bc...4abf70a661a5