[Qemu-commits] [qemu/qemu] dbf231: qemu-iotests/iotests.py: improve assert_qmp message

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: dbf231d7b40ebc2dfd9a7c31c46dad6011d9c308
      
https://github.com/qemu/qemu/commit/dbf231d7b40ebc2dfd9a7c31c46dad6011d9c308
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2019-11-18 (Mon, 18 Nov 2019)

  Changed paths:
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  qemu-iotests/iotests.py: improve assert_qmp message

>From the two values compared, make it obvious which is found at path, and
which is expected.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: d44abcc0f71a08e5777f8d4fe92902dc2eaaa468
      
https://github.com/qemu/qemu/commit/d44abcc0f71a08e5777f8d4fe92902dc2eaaa468
  Author: Kevin Wolf <address@hidden>
  Date:   2019-11-18 (Mon, 18 Nov 2019)

  Changed paths:
    M tests/qemu-iotests/check

  Log Message:
  -----------
  iotests: Fix "no qualified output" error path

The variable for error messages to be displayed is $results, not
$reason. Fix 'check' to print the "no qualified output" error message
again instead of having a failure without any message telling the user
why it failed.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>


  Commit: ae0f57f0aa03571045a3accc0b22d91a4775e63c
      
https://github.com/qemu/qemu/commit/ae0f57f0aa03571045a3accc0b22d91a4775e63c
  Author: Kevin Wolf <address@hidden>
  Date:   2019-11-18 (Mon, 18 Nov 2019)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Remove 'backing': null from bs->{explicit_,}options

bs->options and bs->explicit_options shouldn't contain any options for
child nodes. bdrv_open_inherited() takes care to remove any options that
match a child name after opening the image and the same is done when
reopening.

However, we miss the case of 'backing': null, which is a child option,
but results in no child being created. This means that a 'backing': null
remains in bs->options and bs->explicit_options.

A typical use for 'backing': null is in live snapshots: blockdev-add for
the qcow2 overlay makes sure not to open the backing file (because it is
already opened and blockdev-snapshot will attach it). After doing a
blockdev-snapshot, bs->options and bs->explicit_options become
inconsistent with the actual state (bs has a backing file now, but the
options still say null). On the next occasion that the image is
reopened, e.g. switching it from read-write to read-only when another
snapshot is taken, the option will take effect again and the node
incorrectly loses its backing file.

Fix bdrv_open_inherited() to remove the 'backing' option from
bs->options and bs->explicit_options even for the case where it
specifies that no backing file is wanted.

Reported-by: Peter Krempa <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Tested-by: Peter Krempa <address@hidden>


  Commit: b1f6a8e180367c945b67c6c9bbcec5c856be3779
      
https://github.com/qemu/qemu/commit/b1f6a8e180367c945b67c6c9bbcec5c856be3779
  Author: Kevin Wolf <address@hidden>
  Date:   2019-11-18 (Mon, 18 Nov 2019)

  Changed paths:
    A tests/qemu-iotests/273
    A tests/qemu-iotests/273.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  iotests: Test multiple blockdev-snapshot calls

Test that doing a second blockdev-snapshot doesn't make the first
overlay's backing file go away.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Peter Krempa <address@hidden>


  Commit: a5c2a235103ab366ad5318636ec138e52c6dcfa4
      
https://github.com/qemu/qemu/commit/a5c2a235103ab366ad5318636ec138e52c6dcfa4
  Author: Peter Maydell <address@hidden>
  Date:   2019-11-18 (Mon, 18 Nov 2019)

  Changed paths:
    M block.c
    A tests/qemu-iotests/273
    A tests/qemu-iotests/273.out
    M tests/qemu-iotests/check
    M tests/qemu-iotests/group
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches:

- Fix HMP savevm with -blockdev
- Minor iotests improvements

# gpg: Signature made Mon 18 Nov 2019 16:51:56 GMT
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  iotests: Test multiple blockdev-snapshot calls
  block: Remove 'backing': null from bs->{explicit_,}options
  iotests: Fix "no qualified output" error path
  qemu-iotests/iotests.py: improve assert_qmp message

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/1bd0f1c9c149...a5c2a235103a