• Stefan Hajnoczi's avatar
    Merge remote-tracking branch 'kwolf/tags/for-upstream' into staging · 0748b352
    Stefan Hajnoczi authored
    Block layer patches
    # gpg: Signature made Mon 29 May 2017 03:34:59 PM BST
    # gpg:                using RSA key 0x7F09B272C88F2FD6
    # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
    # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6
    * kwolf/tags/for-upstream:
      block/file-*: *_parse_filename() and colons
      block: Fix backing paths for filenames with colons
      block: Tweak error message related to qemu-img amend
      qemu-img: Fix leakage of options on error
      qemu-img: copy *key-secret opts when opening newly created files
      qemu-img: introduce --target-image-opts for 'convert' command
      qemu-img: fix --image-opts usage with dd command
      qemu-img: add support for --object with 'dd' command
      qemu-img: Fix documentation of convert
      qcow2: remove extra local_error variable
      mirror: Drop permissions on s->target on completion
      nvme: Add support for Controller Memory Buffers
      iotests: 147: Don't test inet6 if not available
      qemu-iotests: Test streaming with missing job ID
      stream: fix crash in stream_start() when block_job_create() fails
    Signed-off-by: 's avatarStefan Hajnoczi <stefanha@redhat.com>
qemu-img.c 131 KB