On Mon, 05/15 14:54, Eric Blake wrote:
> Fam's addition of --force-share in commits 459571f7 and 335e9937
> were developed prior to the addition of QDict scalar insertion
> macros, but merged after the general cleanup in commit 46f5ac20.
> Patch created mechanically by rerunning:
>
> spatch --sp-file scripts/coccinelle/qobject.cocci \
> --macro-file scripts/cocci-macro-file.h --dir . --in-place
>
> Signed-off-by: Eric Blake <ebl...@redhat.com>
> ---
>
> This could go in through Markus' qapi tree (since he took the
> original cleanup), a block maintainer (since it only touches block
> files), or even the trivial patch queue (since it's so small and
> mechanical) - I don't care which, as long as we don't drop it!
>
> qemu-img.c | 7 +++----
> qemu-io.c | 2 +-
> 2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/qemu-img.c b/qemu-img.c
> index b506839..60f1784 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -296,7 +296,7 @@ static BlockBackend *img_open_opts(const char *optstr,
> error_report("--force-share/-U conflicts with image 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) {
> @@ -326,7 +326,7 @@ static BlockBackend *img_open_file(const char *filename,
> }
>
> if (force_share) {
> - qdict_put(options, BDRV_OPT_FORCE_SHARE, qbool_from_bool(true));
> + qdict_put_bool(options, BDRV_OPT_FORCE_SHARE, true);
> }
> blk = blk_new_open(filename, NULL, options, flags, &local_err);
> if (!blk) {
> @@ -3156,8 +3156,7 @@ static int img_rebase(int argc, char **argv)
> if (!options) {
> options = qdict_new();
> }
> - qdict_put(options, BDRV_OPT_FORCE_SHARE,
> - qbool_from_bool(true));
> + qdict_put_bool(options, BDRV_OPT_FORCE_SHARE, true);
> }
> bdrv_get_backing_filename(bs, backing_name, sizeof(backing_name));
> blk_old_backing = blk_new_open(backing_name, NULL,
> diff --git a/qemu-io.c b/qemu-io.c
> index 34fa8a1..8e38b28 100644
> --- a/qemu-io.c
> +++ b/qemu-io.c
> @@ -76,7 +76,7 @@ static int openfile(char *name, int flags, bool
> writethrough, bool force_share,
> QDECREF(opts);
> return 1;
> }
> - qdict_put(opts, BDRV_OPT_FORCE_SHARE, qbool_from_bool(true));
> + qdict_put_bool(opts, BDRV_OPT_FORCE_SHARE, true);
> }
> qemuio_blk = blk_new_open(name, NULL, opts, flags, &local_err);
> if (!qemuio_blk) {
> --
> 2.9.4
>
>
Reviewed-by: Fam Zheng <f...@redhat.com>
