Commit 579cf1d1 authored by Eric Blake's avatar Eric Blake Committed by Markus Armbruster
Browse files

block: Use QDict helpers for --force-share 



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: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20170515195439.17677-1-eblake@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 08fba7ac

qemu-img.c

+3 −4
Original line number Diff line number Diff line
@@ -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,

qemu-io.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {