From: Stefan Hajnoczi Date: Tue, 30 May 2017 13:15:15 +0000 (+0100) Subject: Merge remote-tracking branch 'kwolf/tags/for-upstream' into staging X-Git-Tag: v2.10.0-rc0~167 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0748b3526e8cb78b9cd64208426bfc3d54a72b04;p=users%2Fdwmw2%2Fqemu.git Merge remote-tracking branch 'kwolf/tags/for-upstream' into staging 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 " # 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: Stefan Hajnoczi --- 0748b3526e8cb78b9cd64208426bfc3d54a72b04 diff --cc qemu-img.c index 60f1784f11,5aef8ef047..0ad698d7f1 --- a/qemu-img.c +++ b/qemu-img.c @@@ -294,9 -295,10 +295,10 @@@ static BlockBackend *img_open_opts(cons if (qdict_haskey(options, BDRV_OPT_FORCE_SHARE) && !qdict_get_bool(options, BDRV_OPT_FORCE_SHARE)) { error_report("--force-share/-U conflicts with image options"); + QDECREF(options); return NULL; } - qdict_put(options, BDRV_OPT_FORCE_SHARE, qbool_from_bool(true)); + qdict_put_bool(options, BDRV_OPT_FORCE_SHARE, true); } blk = blk_new_open(NULL, NULL, options, flags, &local_err); if (!blk) {