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

error: Reduce unnecessary error propagation 



When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away, even when we need to keep error_propagate() for other
error paths.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-38-armbru@redhat.com>
parent 992861fb

block.c

+1 −1
Original line number Diff line number Diff line
@@ -6058,7 +6058,7 @@ void bdrv_img_create(const char *filename, const char *fmt, 


    /* Parse -o options */

    if (options) {

        if (!qemu_opts_do_parse(opts, options, NULL, &local_err)) {

        if (!qemu_opts_do_parse(opts, options, NULL, errp)) {

            goto out;

        }

    }

block/gluster.c

+4 −4
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, 


    /* create opts info from runtime_json_opts list */

    opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort);

    if (!qemu_opts_absorb_qdict(opts, options, &local_err)) {

    if (!qemu_opts_absorb_qdict(opts, options, errp)) {

        goto out;

    }
@@ -554,7 +554,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, 


        /* create opts info from runtime_type_opts list */

        opts = qemu_opts_create(&runtime_type_opts, NULL, 0, &error_abort);

        if (!qemu_opts_absorb_qdict(opts, backing_options, &local_err)) {

        if (!qemu_opts_absorb_qdict(opts, backing_options, errp)) {

            goto out;

        }
@@ -584,7 +584,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, 
        if (gsconf->type == SOCKET_ADDRESS_TYPE_INET) {

            /* create opts info from runtime_inet_opts list */

            opts = qemu_opts_create(&runtime_inet_opts, NULL, 0, &error_abort);

            if (!qemu_opts_absorb_qdict(opts, backing_options, &local_err)) {

            if (!qemu_opts_absorb_qdict(opts, backing_options, errp)) {

                goto out;

            }
@@ -632,7 +632,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, 
        } else {

            /* create opts info from runtime_unix_opts list */

            opts = qemu_opts_create(&runtime_unix_opts, NULL, 0, &error_abort);

            if (!qemu_opts_absorb_qdict(opts, backing_options, &local_err)) {

            if (!qemu_opts_absorb_qdict(opts, backing_options, errp)) {

                goto out;

            }

block/parallels.c

+1 −1
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, 
        goto fail_options;

    }



    if (!qemu_opts_absorb_qdict(opts, options, &local_err)) {

    if (!qemu_opts_absorb_qdict(opts, options, errp)) {

        goto fail_options;

    }

block/quorum.c

+1 −1
Original line number Diff line number Diff line
@@ -921,7 +921,7 @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags, 
    }



    opts = qemu_opts_create(&quorum_runtime_opts, NULL, 0, &error_abort);

    if (!qemu_opts_absorb_qdict(opts, options, &local_err)) {

    if (!qemu_opts_absorb_qdict(opts, options, errp)) {

        ret = -EINVAL;

        goto exit;

    }

block/replication.c

+1 −2
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ static int replication_open(BlockDriverState *bs, QDict *options, 
{

    int ret;

    BDRVReplicationState *s = bs->opaque;

    Error *local_err = NULL;

    QemuOpts *opts = NULL;

    const char *mode;

    const char *top_id;
@@ -99,7 +98,7 @@ static int replication_open(BlockDriverState *bs, QDict *options, 


    ret = -EINVAL;

    opts = qemu_opts_create(&replication_runtime_opts, NULL, 0, &error_abort);

    if (!qemu_opts_absorb_qdict(opts, options, &local_err)) {

    if (!qemu_opts_absorb_qdict(opts, options, errp)) {

        goto fail;

    }