Commit 1f584248 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qapi: Only input visitors can actually fail 



The previous few commits have made this more obvious, and removed the
one exception.  Time to clarify the documentation, and drop dead error
checking.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20200424084338.26803-13-armbru@redhat.com>
parent 7111a86e

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);

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",

include/qapi/visitor-impl.h

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ typedef enum VisitorType { 


struct Visitor

{

    /*

     * Only input visitors may fail!

     */



    /* Must be set to visit structs */

    void (*start_struct)(Visitor *v, const char *name, void **obj,

                         size_t size, Error **errp);