From: Kevin Wolf Date: Mon, 29 May 2017 14:34:27 +0000 (+0200) Subject: Merge remote-tracking branch 'mreitz/tags/pull-block-2017-05-29-v3' into queue-block X-Git-Tag: qemu-xen-4.10.0-rc1~231^2 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=42a48128417b3bfade93d1a4721348cc480e9e50;p=qemu-xen.git Merge remote-tracking branch 'mreitz/tags/pull-block-2017-05-29-v3' into queue-block Block patches for the block queue # gpg: Signature made Mon May 29 16:32:16 2017 CEST # gpg: using RSA key 0xF407DB0061D5CF40 # gpg: Good signature from "Max Reitz " # Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40 * mreitz/tags/pull-block-2017-05-29-v3: 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 Signed-off-by: Kevin Wolf --- 42a48128417b3bfade93d1a4721348cc480e9e50