Commit b11a093c authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qapi: Smooth another visitor error checking pattern 



Convert

    visit_type_FOO(v, ..., &ptr, &err);
    ...
    if (err) {
        ...
    }

to

    visit_type_FOO(v, ..., &ptr, errp);
    ...
    if (!ptr) {
        ...
    }

for functions that set @ptr to non-null / null on success / error.

Eliminate error_propagate() that are now unnecessary.  Delete @err
that are now unused.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-40-armbru@redhat.com>
parent 4bc6d7ee

block/nfs.c

+2 −5
Original line number Diff line number Diff line
@@ -563,18 +563,15 @@ static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options, 
    BlockdevOptionsNfs *opts = NULL;

    Visitor *v;

    const QDictEntry *e;

    Error *local_err = NULL;



    v = qobject_input_visitor_new_flat_confused(options, errp);

    if (!v) {

        return NULL;

    }



    visit_type_BlockdevOptionsNfs(v, NULL, &opts, &local_err);

    visit_type_BlockdevOptionsNfs(v, NULL, &opts, errp);

    visit_free(v);



    if (local_err) {

        error_propagate(errp, local_err);

    if (!opts) {

        return NULL;

    }

block/parallels.c

+2 −5
Original line number Diff line number Diff line
@@ -625,7 +625,6 @@ static int coroutine_fn parallels_co_create_opts(BlockDriver *drv, 
                                                 Error **errp)

{

    BlockdevCreateOptions *create_options = NULL;

    Error *local_err = NULL;

    BlockDriverState *bs = NULL;

    QDict *qdict;

    Visitor *v;
@@ -668,11 +667,9 @@ static int coroutine_fn parallels_co_create_opts(BlockDriver *drv, 
        goto done;

    }



    visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);

    visit_type_BlockdevCreateOptions(v, NULL, &create_options, errp);

    visit_free(v);



    if (local_err) {

        error_propagate(errp, local_err);

    if (!create_options) {

        ret = -EINVAL;

        goto done;

    }

block/qcow.c

+2 −5
Original line number Diff line number Diff line
@@ -943,7 +943,6 @@ static int coroutine_fn qcow_co_create_opts(BlockDriver *drv, 
    QDict *qdict;

    Visitor *v;

    const char *val;

    Error *local_err = NULL;

    int ret;



    static const QDictRenames opt_renames[] = {
@@ -995,11 +994,9 @@ static int coroutine_fn qcow_co_create_opts(BlockDriver *drv, 
        goto fail;

    }



    visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);

    visit_type_BlockdevCreateOptions(v, NULL, &create_options, errp);

    visit_free(v);



    if (local_err) {

        error_propagate(errp, local_err);

    if (!create_options) {

        ret = -EINVAL;

        goto fail;

    }

block/qcow2.c

+2 −5
Original line number Diff line number Diff line
@@ -3685,7 +3685,6 @@ static int coroutine_fn qcow2_co_create_opts(BlockDriver *drv, 
    Visitor *v;

    BlockDriverState *bs = NULL;

    BlockDriverState *data_bs = NULL;

    Error *local_err = NULL;

    const char *val;

    int ret;
@@ -3781,11 +3780,9 @@ static int coroutine_fn qcow2_co_create_opts(BlockDriver *drv, 
        goto finish;

    }



    visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);

    visit_type_BlockdevCreateOptions(v, NULL, &create_options, errp);

    visit_free(v);



    if (local_err) {

        error_propagate(errp, local_err);

    if (!create_options) {

        ret = -EINVAL;

        goto finish;

    }

block/qed.c

+2 −5
Original line number Diff line number Diff line
@@ -729,7 +729,6 @@ static int coroutine_fn bdrv_qed_co_create_opts(BlockDriver *drv, 
    QDict *qdict;

    Visitor *v;

    BlockDriverState *bs = NULL;

    Error *local_err = NULL;

    int ret;



    static const QDictRenames opt_renames[] = {
@@ -771,11 +770,9 @@ static int coroutine_fn bdrv_qed_co_create_opts(BlockDriver *drv, 
        goto fail;

    }



    visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);

    visit_type_BlockdevCreateOptions(v, NULL, &create_options, errp);

    visit_free(v);



    if (local_err) {

        error_propagate(errp, local_err);

    if (!create_options) {

        ret = -EINVAL;

        goto fail;

    }