Commit 4bdc24fa authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ericb/tags/pull-qapi-2018-03-12-v4' into staging 



qapi patches for 2018-03-12, 2.12 softfreeze

- Marc-André Lureau: 0/4 qapi: generate a literal qobject for introspection
- Max Reitz: 0/7 block: Handle null backing link
- Daniel P. Berrange: chardev: tcp: postpone TLS work until machine done
- Peter Xu: 00/23 QMP: out-of-band (OOB) execution support
- Vladimir Sementsov-Ogievskiy: 0/2 block latency histogram
- Eric Blake: qapi: Pass '-u' when doing non-silent diff

# gpg: Signature made Mon 19 Mar 2018 19:59:04 GMT
# gpg:                using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>"
# gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
# gpg:                 aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-qapi-2018-03-12-v4: (38 commits)
  qapi: Pass '-u' when doing non-silent diff
  qapi: add block latency histogram interface
  block/accounting: introduce latency histogram
  tests: qmp-test: add oob test
  tests: qmp-test: verify command batching
  qmp: add command "x-oob-test"
  monitor: enable IO thread for (qmp & !mux) typed
  qmp: isolate responses into io thread
  qmp: support out-of-band (oob) execution
  qapi: introduce new cmd option "allow-oob"
  monitor: send event when command queue full
  qmp: add new event "command-dropped"
  monitor: separate QMP parser and dispatcher
  monitor: let suspend/resume work even with QMPs
  monitor: let suspend_cnt be thread safe
  monitor: introduce monitor_qmp_respond()
  qmp: introduce QMPCapability
  monitor: allow using IO thread for parsing
  monitor: let mon_list be tail queue
  monitor: unify global init
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c26ef392 02e3092d

block.c

+10 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "qapi/error.h"

#include "qapi/qmp/qdict.h"

#include "qapi/qmp/qjson.h"

#include "qapi/qmp/qnull.h"

#include "qapi/qmp/qstring.h"

#include "qapi/qobject-output-visitor.h"

#include "qapi/qapi-visit-block-core.h"
@@ -1457,7 +1458,7 @@ static QDict *parse_json_filename(const char *filename, Error **errp) 
        return NULL;

    }



    options = qobject_to_qdict(options_obj);

    options = qobject_to(QDict, options_obj);

    if (!options) {

        qobject_decref(options_obj);

        error_setg(errp, "Invalid JSON object given");
@@ -2433,7 +2434,7 @@ BlockDriverState *bdrv_open_blockdev_ref(BlockdevRef *ref, Error **errp) 
        }

        visit_complete(v, &obj);



        qdict = qobject_to_qdict(obj);

        qdict = qobject_to(QDict, obj);

        qdict_flatten(qdict);



        /* bdrv_open_inherit() defaults to the values in bdrv_flags (for
@@ -2645,7 +2646,13 @@ static BlockDriverState *bdrv_open_inherit(const char *filename, 


    /* See cautionary note on accessing @options above */

    backing = qdict_get_try_str(options, "backing");

    if (backing && *backing == '\0') {

    if (qobject_to(QNull, qdict_get(options, "backing")) != NULL ||

        (backing && *backing == '\0'))

    {

        if (backing) {

            warn_report("Use of \"backing\": \"\" is deprecated; "

                        "use \"backing\": null instead");

        }

        flags |= BDRV_O_NO_BACKING;

        qdict_del(options, "backing");

    }

block/accounting.c

+91 −0
Original line number Diff line number Diff line
@@ -94,6 +94,94 @@ void block_acct_start(BlockAcctStats *stats, BlockAcctCookie *cookie, 
    cookie->type = type;

}



/* block_latency_histogram_compare_func:

 * Compare @key with interval [@it[0], @it[1]).

 * Return: -1 if @key < @it[0]

 *          0 if @key in [@it[0], @it[1])

 *         +1 if @key >= @it[1]

 */

static int block_latency_histogram_compare_func(const void *key, const void *it)

{

    uint64_t k = *(uint64_t *)key;

    uint64_t a = ((uint64_t *)it)[0];

    uint64_t b = ((uint64_t *)it)[1];



    return k < a ? -1 : (k < b ? 0 : 1);

}



static void block_latency_histogram_account(BlockLatencyHistogram *hist,

                                            int64_t latency_ns)

{

    uint64_t *pos;



    if (hist->bins == NULL) {

        /* histogram disabled */

        return;

    }





    if (latency_ns < hist->boundaries[0]) {

        hist->bins[0]++;

        return;

    }



    if (latency_ns >= hist->boundaries[hist->nbins - 2]) {

        hist->bins[hist->nbins - 1]++;

        return;

    }



    pos = bsearch(&latency_ns, hist->boundaries, hist->nbins - 2,

                  sizeof(hist->boundaries[0]),

                  block_latency_histogram_compare_func);

    assert(pos != NULL);



    hist->bins[pos - hist->boundaries + 1]++;

}



int block_latency_histogram_set(BlockAcctStats *stats, enum BlockAcctType type,

                                uint64List *boundaries)

{

    BlockLatencyHistogram *hist = &stats->latency_histogram[type];

    uint64List *entry;

    uint64_t *ptr;

    uint64_t prev = 0;

    int new_nbins = 1;



    for (entry = boundaries; entry; entry = entry->next) {

        if (entry->value <= prev) {

            return -EINVAL;

        }

        new_nbins++;

        prev = entry->value;

    }



    hist->nbins = new_nbins;

    g_free(hist->boundaries);

    hist->boundaries = g_new(uint64_t, hist->nbins - 1);

    for (entry = boundaries, ptr = hist->boundaries; entry;

         entry = entry->next, ptr++)

    {

        *ptr = entry->value;

    }



    g_free(hist->bins);

    hist->bins = g_new0(uint64_t, hist->nbins);



    return 0;

}



void block_latency_histograms_clear(BlockAcctStats *stats)

{

    int i;



    for (i = 0; i < BLOCK_MAX_IOTYPE; i++) {

        BlockLatencyHistogram *hist = &stats->latency_histogram[i];

        g_free(hist->bins);

        g_free(hist->boundaries);

        memset(hist, 0, sizeof(*hist));

    }

}



static void block_account_one_io(BlockAcctStats *stats, BlockAcctCookie *cookie,

                                 bool failed)

{
@@ -116,6 +204,9 @@ static void block_account_one_io(BlockAcctStats *stats, BlockAcctCookie *cookie, 
        stats->nr_ops[cookie->type]++;

    }



    block_latency_histogram_account(&stats->latency_histogram[cookie->type],

                                    latency_ns);



    if (!failed || stats->account_failed) {

        stats->total_time_ns[cookie->type] += latency_ns;

        stats->last_access_time_ns = time_ns;

block/parallels.c

+1 −1
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ static int coroutine_fn parallels_co_create_opts(const char *filename, 


    qobj = qdict_crumple(qdict, errp);

    QDECREF(qdict);

    qdict = qobject_to_qdict(qobj);

    qdict = qobject_to(QDict, qobj);

    if (qdict == NULL) {

        ret = -EINVAL;

        goto done;

block/qapi.c

+47 −6
Original line number Diff line number Diff line
@@ -394,6 +394,37 @@ static void bdrv_query_info(BlockBackend *blk, BlockInfo **p_info, 
    qapi_free_BlockInfo(info);

}



static uint64List *uint64_list(uint64_t *list, int size)

{

    int i;

    uint64List *out_list = NULL;

    uint64List **pout_list = &out_list;



    for (i = 0; i < size; i++) {

        uint64List *entry = g_new(uint64List, 1);

        entry->value = list[i];

        *pout_list = entry;

        pout_list = &entry->next;

    }



    *pout_list = NULL;



    return out_list;

}



static void bdrv_latency_histogram_stats(BlockLatencyHistogram *hist,

                                         bool *not_null,

                                         BlockLatencyHistogramInfo **info)

{

    *not_null = hist->bins != NULL;

    if (*not_null) {

        *info = g_new0(BlockLatencyHistogramInfo, 1);



        (*info)->boundaries = uint64_list(hist->boundaries, hist->nbins - 1);

        (*info)->bins = uint64_list(hist->bins, hist->nbins);

    }

}



static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk)

{

    BlockAcctStats *stats = blk_get_stats(blk);
@@ -459,6 +490,16 @@ static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk) 
        dev_stats->avg_wr_queue_depth =

            block_acct_queue_depth(ts, BLOCK_ACCT_WRITE);

    }



    bdrv_latency_histogram_stats(&stats->latency_histogram[BLOCK_ACCT_READ],

                                 &ds->has_x_rd_latency_histogram,

                                 &ds->x_rd_latency_histogram);

    bdrv_latency_histogram_stats(&stats->latency_histogram[BLOCK_ACCT_WRITE],

                                 &ds->has_x_wr_latency_histogram,

                                 &ds->x_wr_latency_histogram);

    bdrv_latency_histogram_stats(&stats->latency_histogram[BLOCK_ACCT_FLUSH],

                                 &ds->has_x_flush_latency_histogram,

                                 &ds->x_flush_latency_histogram);

}



static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs,
@@ -647,29 +688,29 @@ static void dump_qobject(fprintf_function func_fprintf, void *f, 
{

    switch (qobject_type(obj)) {

        case QTYPE_QNUM: {

            QNum *value = qobject_to_qnum(obj);

            QNum *value = qobject_to(QNum, obj);

            char *tmp = qnum_to_string(value);

            func_fprintf(f, "%s", tmp);

            g_free(tmp);

            break;

        }

        case QTYPE_QSTRING: {

            QString *value = qobject_to_qstring(obj);

            QString *value = qobject_to(QString, obj);

            func_fprintf(f, "%s", qstring_get_str(value));

            break;

        }

        case QTYPE_QDICT: {

            QDict *value = qobject_to_qdict(obj);

            QDict *value = qobject_to(QDict, obj);

            dump_qdict(func_fprintf, f, comp_indent, value);

            break;

        }

        case QTYPE_QLIST: {

            QList *value = qobject_to_qlist(obj);

            QList *value = qobject_to(QList, obj);

            dump_qlist(func_fprintf, f, comp_indent, value);

            break;

        }

        case QTYPE_QBOOL: {

            QBool *value = qobject_to_qbool(obj);

            QBool *value = qobject_to(QBool, obj);

            func_fprintf(f, "%s", qbool_get_bool(value) ? "true" : "false");

            break;

        }
@@ -730,7 +771,7 @@ void bdrv_image_info_specific_dump(fprintf_function func_fprintf, void *f, 


    visit_type_ImageInfoSpecific(v, NULL, &info_spec, &error_abort);

    visit_complete(v, &obj);

    data = qdict_get(qobject_to_qdict(obj), "data");

    data = qdict_get(qobject_to(QDict, obj), "data");

    dump_qobject(func_fprintf, f, 1, data);

    qobject_decref(obj);

    visit_free(v);

block/qcow.c

+1 −1
Original line number Diff line number Diff line
@@ -996,7 +996,7 @@ static int coroutine_fn qcow_co_create_opts(const char *filename, 


    qobj = qdict_crumple(qdict, errp);

    QDECREF(qdict);

    qdict = qobject_to_qdict(qobj);

    qdict = qobject_to(QDict, qobj);

    if (qdict == NULL) {

        ret = -EINVAL;

        goto fail;