Commit 76d20ea0 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'armbru/tags/pull-qapi-2017-05-04-v3' into staging 



QAPI patches for 2017-05-04

# gpg: Signature made Tue 09 May 2017 03:16:12 AM EDT
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* armbru/tags/pull-qapi-2017-05-04-v3: (28 commits)
  qmp-shell: improve help
  qmp-shell: don't show version greeting if unavailable
  qmp-shell: Cope with query-commands error
  qmp-shell: add -N option to skip negotiate
  qmp-shell: add persistent command history
  qobject-input-visitor: Catch misuse of end_struct vs. end_list
  qapi: Document intended use of @name within alternate visits
  qobject-input-visitor: Document full_name_nth()
  qmp: Improve QMP dispatch error messages
  sockets: Delete unused helper socket_address_crumple()
  sockets: Limit SocketAddressLegacy to external interfaces
  sockets: Rename SocketAddressFlat to SocketAddress
  sockets: Rename SocketAddress to SocketAddressLegacy
  qapi: New QAPI_CLONE_MEMBERS()
  sockets: Prepare inet_parse() for flattened SocketAddress
  sockets: Prepare vsock_parse() for flattened SocketAddress
  test-qga: Actually test 0xff sync bytes
  fdc-test: Avoid deprecated 'change' command
  QemuOpts: Simplify qemu_opts_to_qdict()
  block: Simplify bdrv_append_temp_snapshot() logic
  ...

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 7ed57b66 dcd3b25d

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1395,6 +1395,7 @@ S: Supported 
F: qobject/

F: include/qapi/qmp/

X: include/qapi/qmp/dispatch.h

F: scripts/coccinelle/qobject.cocci

F: tests/check-qdict.c

F: tests/check-qfloat.c

F: tests/check-qint.c

block.c

+27 −41
Original line number Diff line number Diff line
@@ -974,16 +974,14 @@ static void update_flags_from_options(int *flags, QemuOpts *opts) 
static void update_options_from_flags(QDict *options, int flags)

{

    if (!qdict_haskey(options, BDRV_OPT_CACHE_DIRECT)) {

        qdict_put(options, BDRV_OPT_CACHE_DIRECT,

                  qbool_from_bool(flags & BDRV_O_NOCACHE));

        qdict_put_bool(options, BDRV_OPT_CACHE_DIRECT, flags & BDRV_O_NOCACHE);

    }

    if (!qdict_haskey(options, BDRV_OPT_CACHE_NO_FLUSH)) {

        qdict_put(options, BDRV_OPT_CACHE_NO_FLUSH,

                  qbool_from_bool(flags & BDRV_O_NO_FLUSH));

        qdict_put_bool(options, BDRV_OPT_CACHE_NO_FLUSH,

                       flags & BDRV_O_NO_FLUSH);

    }

    if (!qdict_haskey(options, BDRV_OPT_READ_ONLY)) {

        qdict_put(options, BDRV_OPT_READ_ONLY,

                  qbool_from_bool(!(flags & BDRV_O_RDWR)));

        qdict_put_bool(options, BDRV_OPT_READ_ONLY, !(flags & BDRV_O_RDWR));

    }

}
@@ -1399,7 +1397,7 @@ static int bdrv_fill_options(QDict **options, const char *filename, 
    /* Fetch the file name from the options QDict if necessary */

    if (protocol && filename) {

        if (!qdict_haskey(*options, "filename")) {

            qdict_put(*options, "filename", qstring_from_str(filename));

            qdict_put_str(*options, "filename", filename);

            parse_filename = true;

        } else {

            error_setg(errp, "Can't specify 'file' and 'filename' options at "
@@ -1420,7 +1418,7 @@ static int bdrv_fill_options(QDict **options, const char *filename, 
            }



            drvname = drv->format_name;

            qdict_put(*options, "driver", qstring_from_str(drvname));

            qdict_put_str(*options, "driver", drvname);

        } else {

            error_setg(errp, "Must specify either driver or file");

            return -EINVAL;
@@ -2075,7 +2073,7 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *parent_options, 
    }



    if (bs->backing_format[0] != '\0' && !qdict_haskey(options, "driver")) {

        qdict_put(options, "driver", qstring_from_str(bs->backing_format));

        qdict_put_str(options, "driver", bs->backing_format);

    }



    backing_hd = bdrv_open_inherit(*backing_filename ? backing_filename : NULL,
@@ -2197,7 +2195,7 @@ static BlockDriverState *bdrv_append_temp_snapshot(BlockDriverState *bs, 
    char *tmp_filename = g_malloc0(PATH_MAX + 1);

    int64_t total_size;

    QemuOpts *opts = NULL;

    BlockDriverState *bs_snapshot;

    BlockDriverState *bs_snapshot = NULL;

    Error *local_err = NULL;

    int ret;
@@ -2230,38 +2228,32 @@ static BlockDriverState *bdrv_append_temp_snapshot(BlockDriverState *bs, 
    }



    /* Prepare options QDict for the temporary file */

    qdict_put(snapshot_options, "file.driver",

              qstring_from_str("file"));

    qdict_put(snapshot_options, "file.filename",

              qstring_from_str(tmp_filename));

    qdict_put(snapshot_options, "driver",

              qstring_from_str("qcow2"));

    qdict_put_str(snapshot_options, "file.driver", "file");

    qdict_put_str(snapshot_options, "file.filename", tmp_filename);

    qdict_put_str(snapshot_options, "driver", "qcow2");



    bs_snapshot = bdrv_open(NULL, NULL, snapshot_options, flags, errp);

    snapshot_options = NULL;

    if (!bs_snapshot) {

        ret = -EINVAL;

        goto out;

    }



    /* bdrv_append() consumes a strong reference to bs_snapshot (i.e. it will

     * call bdrv_unref() on it), so in order to be able to return one, we have

     * to increase bs_snapshot's refcount here */

    /* bdrv_append() consumes a strong reference to bs_snapshot

     * (i.e. it will call bdrv_unref() on it) even on error, so in

     * order to be able to return one, we have to increase

     * bs_snapshot's refcount here */

    bdrv_ref(bs_snapshot);

    bdrv_append(bs_snapshot, bs, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        ret = -EINVAL;

        bs_snapshot = NULL;

        goto out;

    }



    g_free(tmp_filename);

    return bs_snapshot;



out:

    QDECREF(snapshot_options);

    g_free(tmp_filename);

    return NULL;

    return bs_snapshot;

}



/*
@@ -2410,8 +2402,7 @@ static BlockDriverState *bdrv_open_inherit(const char *filename, 
                goto fail;

            }



            qdict_put(options, "file",

                      qstring_from_str(bdrv_get_node_name(file_bs)));

            qdict_put_str(options, "file", bdrv_get_node_name(file_bs));

        }

    }
@@ -2433,8 +2424,8 @@ static BlockDriverState *bdrv_open_inherit(const char *filename, 
         * sure to update both bs->options (which has the full effective

         * options for bs) and options (which has file.* already removed).

         */

        qdict_put(bs->options, "driver", qstring_from_str(drv->format_name));

        qdict_put(options, "driver", qstring_from_str(drv->format_name));

        qdict_put_str(bs->options, "driver", drv->format_name);

        qdict_put_str(options, "driver", drv->format_name);

    } else if (!drv) {

        error_setg(errp, "Must specify either driver or file");

        goto fail;
@@ -2810,12 +2801,12 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue, 
     * that they are checked at the end of this function. */

    value = qemu_opt_get(opts, "node-name");

    if (value) {

        qdict_put(reopen_state->options, "node-name", qstring_from_str(value));

        qdict_put_str(reopen_state->options, "node-name", value);

    }



    value = qemu_opt_get(opts, "driver");

    if (value) {

        qdict_put(reopen_state->options, "driver", qstring_from_str(value));

        qdict_put_str(reopen_state->options, "driver", value);

    }



    /* If we are to stay read-only, do not allow permission change
@@ -4306,8 +4297,7 @@ void bdrv_img_create(const char *filename, const char *fmt, 


            if (backing_fmt) {

                backing_options = qdict_new();

                qdict_put(backing_options, "driver",

                          qstring_from_str(backing_fmt));

                qdict_put_str(backing_options, "driver", backing_fmt);

            }



            bs = bdrv_open(full_backing, NULL, backing_options, back_flags,
@@ -4712,11 +4702,9 @@ void bdrv_refresh_filename(BlockDriverState *bs) 
         * contain a representation of the filename, therefore the following

         * suffices without querying the (exact_)filename of this BDS. */

        if (bs->file->bs->full_open_options) {

            qdict_put_obj(opts, "driver",

                          QOBJECT(qstring_from_str(drv->format_name)));

            qdict_put_str(opts, "driver", drv->format_name);

            QINCREF(bs->file->bs->full_open_options);

            qdict_put_obj(opts, "file",

                          QOBJECT(bs->file->bs->full_open_options));

            qdict_put(opts, "file", bs->file->bs->full_open_options);



            bs->full_open_options = opts;

        } else {
@@ -4732,8 +4720,7 @@ void bdrv_refresh_filename(BlockDriverState *bs) 


        opts = qdict_new();

        append_open_options(opts, bs);

        qdict_put_obj(opts, "driver",

                      QOBJECT(qstring_from_str(drv->format_name)));

        qdict_put_str(opts, "driver", drv->format_name);



        if (bs->exact_filename[0]) {

            /* This may not work for all block protocol drivers (some may
@@ -4743,8 +4730,7 @@ void bdrv_refresh_filename(BlockDriverState *bs) 
             * needs some special format of the options QDict, it needs to

             * implement the driver-specific bdrv_refresh_filename() function.

             */

            qdict_put_obj(opts, "filename",

                          QOBJECT(qstring_from_str(bs->exact_filename)));

            qdict_put_str(opts, "filename", bs->exact_filename);

        }



        bs->full_open_options = opts;

block/blkdebug.c

+4 −4
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ static void blkdebug_parse_filename(const char *filename, QDict *options, 
    if (!strstart(filename, "blkdebug:", &filename)) {

        /* There was no prefix; therefore, all options have to be already

           present in the QDict (except for the filename) */

        qdict_put(options, "x-image", qstring_from_str(filename));

        qdict_put_str(options, "x-image", filename);

        return;

    }
@@ -320,7 +320,7 @@ static void blkdebug_parse_filename(const char *filename, QDict *options, 


    /* TODO Allow multi-level nesting and set file.filename here */

    filename = c + 1;

    qdict_put(options, "x-image", qstring_from_str(filename));

    qdict_put_str(options, "x-image", filename);

}



static QemuOptsList runtime_opts = {
@@ -693,10 +693,10 @@ static void blkdebug_refresh_filename(BlockDriverState *bs, QDict *options) 
    }



    opts = qdict_new();

    qdict_put_obj(opts, "driver", QOBJECT(qstring_from_str("blkdebug")));

    qdict_put_str(opts, "driver", "blkdebug");



    QINCREF(bs->file->bs->full_open_options);

    qdict_put_obj(opts, "image", QOBJECT(bs->file->bs->full_open_options));

    qdict_put(opts, "image", bs->file->bs->full_open_options);



    for (e = qdict_first(options); e; e = qdict_next(options, e)) {

        if (strcmp(qdict_entry_key(e), "x-image")) {

block/blkverify.c

+5 −6
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static void blkverify_parse_filename(const char *filename, QDict *options, 
    if (!strstart(filename, "blkverify:", &filename)) {

        /* There was no prefix; therefore, all options have to be already

           present in the QDict (except for the filename) */

        qdict_put(options, "x-image", qstring_from_str(filename));

        qdict_put_str(options, "x-image", filename);

        return;

    }
@@ -84,7 +84,7 @@ static void blkverify_parse_filename(const char *filename, QDict *options, 


    /* TODO Allow multi-level nesting and set file.filename here */

    filename = c + 1;

    qdict_put(options, "x-image", qstring_from_str(filename));

    qdict_put_str(options, "x-image", filename);

}



static QemuOptsList runtime_opts = {
@@ -288,13 +288,12 @@ static void blkverify_refresh_filename(BlockDriverState *bs, QDict *options) 
        && s->test_file->bs->full_open_options)

    {

        QDict *opts = qdict_new();

        qdict_put_obj(opts, "driver", QOBJECT(qstring_from_str("blkverify")));

        qdict_put_str(opts, "driver", "blkverify");



        QINCREF(bs->file->bs->full_open_options);

        qdict_put_obj(opts, "raw", QOBJECT(bs->file->bs->full_open_options));

        qdict_put(opts, "raw", bs->file->bs->full_open_options);

        QINCREF(s->test_file->bs->full_open_options);

        qdict_put_obj(opts, "test",

                      QOBJECT(s->test_file->bs->full_open_options));

        qdict_put(opts, "test", s->test_file->bs->full_open_options);



        bs->full_open_options = opts;

    }

block/curl.c

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static void curl_clean_state(CURLState *s) 
static void curl_parse_filename(const char *filename, QDict *options,

                                Error **errp)

{

    qdict_put(options, CURL_BLOCK_OPT_URL, qstring_from_str(filename));

    qdict_put_str(options, CURL_BLOCK_OPT_URL, filename);

}



static void curl_detach_aio_context(BlockDriverState *bs)