Commit 68bfd7db authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-04-30' into staging 



QAPI patches for 2020-04-30

# gpg: Signature made Thu 30 Apr 2020 06:29:18 BST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2020-04-30:
  qapi: Generate simpler marshalling code when no arguments
  qapi: Disallow qmp_marshal_FOO(NULL, ...)
  qom: Simplify object_property_get_enum()
  qapi: Only input visitors can actually fail
  qapi: Assert non-input visitors see only valid alternate tags
  qapi: Clean up visitor's recovery from input with invalid type
  qapi: Assert non-input visitors see only valid narrow integers
  qapi: Assert output visitors see only valid enum values
  qapi: Fix Visitor contract for start_alternate()
  qapi: Assert incomplete object occurs only in dealloc visitor
  qapi: Polish prose in visitor.h
  qapi: Document @errp usage more thoroughly in visitor.h
  qapi: Fix typo in visit_start_list()'s contract
  qapi: Fix the virtual walk example in visitor.h's big comment
  qapi: Belatedly update visitor.h's big comment for QAPI modules
  qemu-option: Clean up after the previous commit
  qobject: Eliminate qdict_iter(), use qdict_first(), qdict_next()
  qobject: Eliminate qlist_iter(), use QLIST_FOREACH_ENTRY() instead
  qobject: Factor out helper json_pretty_newline()
  qobject: Clean up QLIST_FOREACH_ENTRY()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 15736033 89bf68f9

block.c

+1 −8
Original line number Diff line number Diff line
@@ -2982,7 +2982,6 @@ BdrvChild *bdrv_open_child(const char *filename, 
BlockDriverState *bdrv_open_blockdev_ref(BlockdevRef *ref, Error **errp)

{

    BlockDriverState *bs = NULL;

    Error *local_err = NULL;

    QObject *obj = NULL;

    QDict *qdict = NULL;

    const char *reference = NULL;
@@ -2995,11 +2994,7 @@ BlockDriverState *bdrv_open_blockdev_ref(BlockdevRef *ref, Error **errp) 
        assert(ref->type == QTYPE_QDICT);



        v = qobject_output_visitor_new(&obj);

        visit_type_BlockdevOptions(v, NULL, &options, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            goto fail;

        }

        visit_type_BlockdevOptions(v, NULL, &options, &error_abort);

        visit_complete(v, &obj);



        qdict = qobject_to(QDict, obj);
@@ -3017,8 +3012,6 @@ BlockDriverState *bdrv_open_blockdev_ref(BlockdevRef *ref, Error **errp) 


    bs = bdrv_open_inherit(NULL, reference, qdict, 0, NULL, NULL, errp);

    obj = NULL;



fail:

    qobject_unref(obj);

    visit_free(v);

    return bs;

block/sheepdog.c

+1 −8
Original line number Diff line number Diff line
@@ -1854,19 +1854,12 @@ static int sd_create_prealloc(BlockdevOptionsSheepdog *location, int64_t size, 
    Visitor *v;

    QObject *obj = NULL;

    QDict *qdict;

    Error *local_err = NULL;

    int ret;



    v = qobject_output_visitor_new(&obj);

    visit_type_BlockdevOptionsSheepdog(v, NULL, &location, &local_err);

    visit_type_BlockdevOptionsSheepdog(v, NULL, &location, &error_abort);

    visit_free(v);



    if (local_err) {

        error_propagate(errp, local_err);

        qobject_unref(obj);

        return -EINVAL;

    }



    qdict = qobject_to(QDict, obj);

    qdict_flatten(qdict);

blockdev.c

+2 −14
Original line number Diff line number Diff line
@@ -3725,14 +3725,8 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp) 
    QObject *obj;

    Visitor *v = qobject_output_visitor_new(&obj);

    QDict *qdict;

    Error *local_err = NULL;



    visit_type_BlockdevOptions(v, NULL, &options, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        goto fail;

    }



    visit_type_BlockdevOptions(v, NULL, &options, &error_abort);

    visit_complete(v, &obj);

    qdict = qobject_to(QDict, obj);
@@ -3760,7 +3754,6 @@ void qmp_x_blockdev_reopen(BlockdevOptions *options, Error **errp) 
    AioContext *ctx;

    QObject *obj;

    Visitor *v = qobject_output_visitor_new(&obj);

    Error *local_err = NULL;

    BlockReopenQueue *queue;

    QDict *qdict;
@@ -3777,12 +3770,7 @@ void qmp_x_blockdev_reopen(BlockdevOptions *options, Error **errp) 
    }



    /* Put all options in a QDict and flatten it */

    visit_type_BlockdevOptions(v, NULL, &options, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        goto fail;

    }



    visit_type_BlockdevOptions(v, NULL, &options, &error_abort);

    visit_complete(v, &obj);

    qdict = qobject_to(QDict, obj);

docs/devel/qapi-code-gen.txt

+3 −1
Original line number Diff line number Diff line
@@ -1446,6 +1446,8 @@ Example: 
            goto out;

        }

        if (!*obj) {

            /* incomplete */

            assert(visit_is_dealloc(v));

            goto out_obj;

        }

        visit_type_UserDefOne_members(v, *obj, &err);
@@ -1577,8 +1579,8 @@ Example: 
    void qmp_marshal_my_command(QDict *args, QObject **ret, Error **errp)

    {

        Error *err = NULL;

        UserDefOne *retval;

        Visitor *v;

        UserDefOne *retval;

        q_obj_my_command_arg arg = {0};



        v = qobject_input_visitor_new(QOBJECT(args));

hw/core/machine-hmp-cmds.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict) 


    while (m) {

        v = string_output_visitor_new(false, &str);

        visit_type_uint16List(v, NULL, &m->value->host_nodes, NULL);

        visit_type_uint16List(v, NULL, &m->value->host_nodes, &error_abort);

        monitor_printf(mon, "memory backend: %s\n", m->value->id);

        monitor_printf(mon, "  size:  %" PRId64 "\n", m->value->size);

        monitor_printf(mon, "  merge: %s\n",