Commit 565f65d2 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

error: Use error_report_err() where appropriate 



Coccinelle semantic patch:

    @@
    expression E;
    @@
    -    error_report("%s", error_get_pretty(E));
    -    error_free(E);
    +    error_report_err(E);
    @@
    expression E, S;
    @@
    -    error_report("%s", error_get_pretty(E));
    +    error_report_err(E);
    (
         exit(S);
    |
         abort();
    )

Trivial manual touch-ups in block/sheepdog.c.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent 2ee2f1e4

arch_init.c

+1 −2
Original line number Diff line number Diff line
@@ -1093,8 +1093,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) 


                            ret = qemu_ram_resize(block->offset, length, &local_err);

                            if (local_err) {

                                error_report("%s", error_get_pretty(local_err));

                                error_free(local_err);

                                error_report_err(local_err);

                            }

                        }

                        break;

block/sheepdog.c

+13 −26
Original line number Diff line number Diff line
@@ -726,8 +726,7 @@ static coroutine_fn void reconnect_to_sdog(void *opaque) 
        s->fd = get_sheep_fd(s, &local_err);

        if (s->fd < 0) {

            DPRINTF("Wait for connection to be established\n");

            error_report("%s", error_get_pretty(local_err));

            error_free(local_err);

            error_report_err(local_err);

            co_aio_sleep_ns(bdrv_get_aio_context(s->bs), QEMU_CLOCK_REALTIME,

                            1000000000ULL);

        }
@@ -1283,8 +1282,7 @@ static int reload_inode(BDRVSheepdogState *s, uint32_t snapid, const char *tag) 


    fd = connect_to_sdog(s, &local_err);

    if (fd < 0) {

        error_report("%s", error_get_pretty(local_err));;

        error_free(local_err);

        error_report_err(local_err);

        return -EIO;

    }
@@ -1292,8 +1290,7 @@ static int reload_inode(BDRVSheepdogState *s, uint32_t snapid, const char *tag) 


    ret = find_vdi_name(s, s->name, snapid, tag, &vid, false, &local_err);

    if (ret) {

        error_report("%s", error_get_pretty(local_err));;

        error_free(local_err);

        error_report_err(local_err);

        goto out;

    }
@@ -1785,8 +1782,7 @@ static void sd_close(BlockDriverState *bs) 


    fd = connect_to_sdog(s, &local_err);

    if (fd < 0) {

        error_report("%s", error_get_pretty(local_err));;

        error_free(local_err);

        error_report_err(local_err);

        return;

    }
@@ -1838,8 +1834,7 @@ static int sd_truncate(BlockDriverState *bs, int64_t offset) 


    fd = connect_to_sdog(s, &local_err);

    if (fd < 0) {

        error_report("%s", error_get_pretty(local_err));;

        error_free(local_err);

        error_report_err(local_err);

        return fd;

    }
@@ -1912,8 +1907,7 @@ static bool sd_delete(BDRVSheepdogState *s) 


    fd = connect_to_sdog(s, &local_err);

    if (fd < 0) {

        error_report("%s", error_get_pretty(local_err));;

        error_free(local_err);

        error_report_err(local_err);

        return false;

    }
@@ -1960,8 +1954,7 @@ static int sd_create_branch(BDRVSheepdogState *s) 
    deleted = sd_delete(s);

    ret = do_sd_create(s, &vid, !deleted, &local_err);

    if (ret) {

        error_report("%s", error_get_pretty(local_err));;

        error_free(local_err);

        error_report_err(local_err);

        goto out;

    }
@@ -1969,8 +1962,7 @@ static int sd_create_branch(BDRVSheepdogState *s) 


    fd = connect_to_sdog(s, &local_err);

    if (fd < 0) {

        error_report("%s", error_get_pretty(local_err));;

        error_free(local_err);

        error_report_err(local_err);

        ret = fd;

        goto out;

    }
@@ -2218,8 +2210,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) 
    /* refresh inode. */

    fd = connect_to_sdog(s, &local_err);

    if (fd < 0) {

        error_report("%s", error_get_pretty(local_err));;

        error_free(local_err);

        error_report_err(local_err);

        ret = fd;

        goto cleanup;

    }
@@ -2234,8 +2225,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) 


    ret = do_sd_create(s, &new_vid, 1, &local_err);

    if (ret < 0) {

        error_report("%s", error_get_pretty(local_err));;

        error_free(local_err);

        error_report_err(local_err);

        error_report("failed to create inode for snapshot. %s",

                     strerror(errno));

        goto cleanup;
@@ -2336,8 +2326,7 @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab) 


    fd = connect_to_sdog(s, &local_err);

    if (fd < 0) {

        error_report("%s", error_get_pretty(local_err));;

        error_free(local_err);

        error_report_err(local_err);

        ret = fd;

        goto out;

    }
@@ -2366,8 +2355,7 @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab) 


    fd = connect_to_sdog(s, &local_err);

    if (fd < 0) {

        error_report("%s", error_get_pretty(local_err));;

        error_free(local_err);

        error_report_err(local_err);

        ret = fd;

        goto out;

    }
@@ -2429,8 +2417,7 @@ static int do_load_save_vmstate(BDRVSheepdogState *s, uint8_t *data, 


    fd = connect_to_sdog(s, &local_err);

    if (fd < 0) {

        error_report("%s", error_get_pretty(local_err));;

        error_free(local_err);

        error_report_err(local_err);

        return fd;

    }

blockdev.c

+4 −8
Original line number Diff line number Diff line
@@ -728,8 +728,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) 
        qemu_opt_rename(all_opts, opt_renames[i].from, opt_renames[i].to,

                        &local_err);

        if (local_err) {

            error_report("%s", error_get_pretty(local_err));

            error_free(local_err);

            error_report_err(local_err);

            return NULL;

        }

    }
@@ -767,8 +766,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) 
                                   &error_abort);

    qemu_opts_absorb_qdict(legacy_opts, bs_opts, &local_err);

    if (local_err) {

        error_report("%s", error_get_pretty(local_err));

        error_free(local_err);

        error_report_err(local_err);

        goto fail;

    }
@@ -983,8 +981,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) 
    bs_opts = NULL;

    if (!blk) {

        if (local_err) {

            error_report("%s", error_get_pretty(local_err));

            error_free(local_err);

            error_report_err(local_err);

        }

        goto fail;

    } else {
@@ -1978,8 +1975,7 @@ int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data) 
    aio_context_acquire(aio_context);



    if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_DRIVE_DEL, &local_err)) {

        error_report("%s", error_get_pretty(local_err));

        error_free(local_err);

        error_report_err(local_err);

        aio_context_release(aio_context);

        return -1;

    }

hw/arm/exynos4210.c

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, 
        if (object_property_find(cpuobj, "has_el3", NULL)) {

            object_property_set_bool(cpuobj, false, "has_el3", &err);

            if (err) {

                error_report("%s", error_get_pretty(err));

                error_report_err(err);

                exit(1);

            }

        }
@@ -168,7 +168,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, 
                                "reset-cbar", &error_abort);

        object_property_set_bool(cpuobj, true, "realized", &err);

        if (err) {

            error_report("%s", error_get_pretty(err));

            error_report_err(err);

            exit(1);

        }

    }

hw/arm/highbank.c

+2 −2
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 
        if (object_property_find(cpuobj, "has_el3", NULL)) {

            object_property_set_bool(cpuobj, false, "has_el3", &err);

            if (err) {

                error_report("%s", error_get_pretty(err));

                error_report_err(err);

                exit(1);

            }

        }
@@ -259,7 +259,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 
        }

        object_property_set_bool(cpuobj, true, "realized", &err);

        if (err) {

            error_report("%s", error_get_pretty(err));

            error_report_err(err);

            exit(1);

        }

        cpu_irq[n] = qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ);