• Peter Maydell's avatar
    Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging · adf2e451
    Peter Maydell authored
    Block layer patches:
    
    - Block graph change fixes (avoid loops, cope with non-tree graphs)
    - bdrv_set_aio_context() related fixes
    - HMP snapshot commands: Use only tag, not the ID to identify snapshots
    - qmeu-img, commit: Error path fixes
    - block/nvme: Build fix for gcc 9
    - MAINTAINERS updates
    - Fix various issues with bdrv_refresh_filename()
    - Fix various iotests
    - Include LUKS overhead in qemu-img measure for qcow2
    - A fix for vmdk's image creation interface
    
    # gpg: Signature made Mon 25 Feb 2019 14:18:15 GMT
    # gpg:                using RSA key 7F09B272C88F2FD6
    # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
    # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6
    
    * remotes/kevin/tags/for-upstream: (71 commits)
      iotests: Skip 211 on insufficient memory
      vmdk: false positive of compat6 with hwversion not set
      iotests: add LUKS payload overhead to 178 qemu-img measure test
      qcow2: include LUKS payload overhead in qemu-img measure
      iotests.py: s/_/-/g on keys in qmp_log()
      iotests: Let 045 be run concurrently
      iotests: Filter SSH paths
      iotests.py: Filter filename in any string value
      iotests.py: Add is_str()
      iotests: Fix 207 to use QMP filters for qmp_log
      iotests: Fix 232 for LUKS
      iotests: Remove superfluous rm from 232
      iotests: Fix 237 for Python 2.x
      iotests: Re-add filename filters
      iotests: Test json:{} filenames of internal BDSs
      block: BDS options may lack the "driver" option
      block/null: Generate filename even with latency-ns
      block/curl: Implement bdrv_refresh_filename()
      block/curl: Harmonize option defaults
      block/nvme: Fix bdrv_refresh_filename()
      ...
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    adf2e451