The following changes since commit aceeaa69d28e6f08a24395d0aa6915b687d0a681:

  Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-12-17' into staging (2019-12-17 15:55:20 +0000)

are available in the Git repository at:

  git://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to f62f08ab7a9d902da70078992248ec5c98f652ad:

  iotests: Test external snapshot with VM state (2019-12-19 18:04:25 +0100)

----------------------------------------------------------------
Block layer patches:

- qemu-img: fix info --backing-chain --image-opts
- Error out on image creation with conflicting size options
- Fix external snapshot with VM state
- hmp: Allow using qdev ID for qemu-io command
- Misc code cleanup
- Many iotests improvements

----------------------------------------------------------------
Alberto Garcia (1):
      qcow2: Use offset_into_cluster()

Daniel P. Berrangé (1):
      qapi: better document NVMe blockdev @device parameter

Kevin Wolf (19):
      block: Error out on image creation with conflicting size options
      blockjob: Fix error message for negative speed
      qcow2: Declare BDRV_REQ_NO_FALLBACK supported
      iotests: Add qemu_io_log()
      iotests: Fix timeout in run_job()
      iotests: Support job-complete in run_job()
      iotests: Create VM.blockdev_create()
      iotests: 255: Drop blockdev_create()
      iotests: 206: Convert to VM.blockdev_create()
      iotests: 210: Convert to VM.blockdev_create()
      iotests: 212: Convert to VM.blockdev_create()
      iotests: 213: Convert to VM.blockdev_create()
      iotests: 237: Convert to VM.blockdev_create()
      iotests: 266: Convert to VM.blockdev_create()
      iotests: 207: Remove duplication with VM.blockdev_create()
      iotests: 211: Remove duplication with VM.blockdev_create()
      block: Activate recursively even for already active nodes
      hmp: Allow using qdev ID for qemu-io command
      iotests: Test external snapshot with VM state

Max Reitz (2):
      iotests/273: Filter format-specific information
      iotests: Fix IMGOPTSSYNTAX for nbd

Stefan Hajnoczi (1):
      qemu-img: fix info --backing-chain --image-opts

Thomas Huth (4):
      iotests: Provide a function for checking the creation of huge files
      iotests: Skip test 060 if it is not possible to create large files
      iotests: Skip test 079 if it is not possible to create large files
      iotests: Add more "_require_drivers" checks to the shell-based tests

Tuguoyi (1):
      qcow2: Move error check of local_err near its assignment

Vladimir Sementsov-Ogievskiy (1):
      MAINTAINERS: fix qcow2-bitmap.c under Dirty Bitmaps header

 qapi/block-core.json          |   6 +-
 block.c                       |  60 ++++++-----
 block/qcow2.c                 |  21 ++--
 blockjob.c                    |   3 +-
 monitor/hmp-cmds.c            |  28 +++--
 qemu-img.c                    |   3 +
 MAINTAINERS                   |   6 +-
 hmp-commands.hx               |   8 +-
 tests/qemu-iotests/005        |   5 +-
 tests/qemu-iotests/030        |   4 +-
 tests/qemu-iotests/049        |   5 +
 tests/qemu-iotests/049.out    |   5 +
 tests/qemu-iotests/051        |   1 +
 tests/qemu-iotests/060        |   3 +
 tests/qemu-iotests/079        |   3 +
 tests/qemu-iotests/206        | 232 ++++++++++++++++++++----------------------
 tests/qemu-iotests/207        |   8 +-
 tests/qemu-iotests/210        |  81 +++++++--------
 tests/qemu-iotests/211        |  12 +--
 tests/qemu-iotests/212        | 101 +++++++++---------
 tests/qemu-iotests/213        | 113 ++++++++++----------
 tests/qemu-iotests/220        |   6 +-
 tests/qemu-iotests/237        | 139 ++++++++++++-------------
 tests/qemu-iotests/255        |  10 --
 tests/qemu-iotests/266        |  69 ++++++-------
 tests/qemu-iotests/266.out    |  14 +++
 tests/qemu-iotests/267        |   1 +
 tests/qemu-iotests/273        |   3 +-
 tests/qemu-iotests/273.out    |  27 -----
 tests/qemu-iotests/279        |  57 +++++++++++
 tests/qemu-iotests/279.out    |  35 +++++++
 tests/qemu-iotests/280        |  83 +++++++++++++++
 tests/qemu-iotests/280.out    |  50 +++++++++
 tests/qemu-iotests/common.rc  |  13 ++-
 tests/qemu-iotests/group      |   2 +
 tests/qemu-iotests/iotests.py |  25 ++++-
 36 files changed, 724 insertions(+), 518 deletions(-)
 create mode 100755 tests/qemu-iotests/279
 create mode 100644 tests/qemu-iotests/279.out
 create mode 100755 tests/qemu-iotests/280
 create mode 100644 tests/qemu-iotests/280.out

On Thu, 19 Dec 2019 at 17:24, Kevin Wolf <kwolf@redhat.com> wrote:
>
> The following changes since commit aceeaa69d28e6f08a24395d0aa6915b687d0a681:
>
>   Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-12-17' into staging (2019-12-17 15:55:20 +0000)
>
> are available in the Git repository at:
>
>   git://repo.or.cz/qemu/kevin.git tags/for-upstream
>
> for you to fetch changes up to f62f08ab7a9d902da70078992248ec5c98f652ad:
>
>   iotests: Test external snapshot with VM state (2019-12-19 18:04:25 +0100)
>
> ----------------------------------------------------------------
> Block layer patches:
>
> - qemu-img: fix info --backing-chain --image-opts
> - Error out on image creation with conflicting size options
> - Fix external snapshot with VM state
> - hmp: Allow using qdev ID for qemu-io command
> - Misc code cleanup
> - Many iotests improvements


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.

-- PMM