Commit 5217f188 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

error: Use error_reportf_err() where appropriate 



Replace

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

by

    error_reportf_err(err, "...: ", ...);

One of the replaced messages lacked a colon.  Add it.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200505101908.6207-6-armbru@redhat.com>
parent d0112758

chardev/char-socket.c

+3 −2
Original line number Diff line number Diff line
@@ -138,8 +138,9 @@ static void check_report_connect_error(Chardev *chr, 
    SocketChardev *s = SOCKET_CHARDEV(chr);



    if (!s->connect_err_reported) {

        error_report("Unable to connect character device %s: %s",

                     chr->label, error_get_pretty(err));

        error_reportf_err(err,

                          "Unable to connect character device %s: ",

                          chr->label);

        s->connect_err_reported = true;

    }

    qemu_chr_socket_restart_timer(chr);

hw/sd/pxa2xx_mmci.c

+2 −2
Original line number Diff line number Diff line
@@ -497,12 +497,12 @@ PXA2xxMMCIState *pxa2xx_mmci_init(MemoryRegion *sysmem, 
    carddev = qdev_create(qdev_get_child_bus(dev, "sd-bus"), TYPE_SD_CARD);

    qdev_prop_set_drive(carddev, "drive", blk, &err);

    if (err) {

        error_report("failed to init SD card: %s", error_get_pretty(err));

        error_reportf_err(err, "failed to init SD card: ");

        return NULL;

    }

    object_property_set_bool(OBJECT(carddev), true, "realized", &err);

    if (err) {

        error_report("failed to init SD card: %s", error_get_pretty(err));

        error_reportf_err(err, "failed to init SD card: ");

        return NULL;

    }

hw/sd/sd.c

+2 −2
Original line number Diff line number Diff line
@@ -703,13 +703,13 @@ SDState *sd_init(BlockBackend *blk, bool is_spi) 
    dev = DEVICE(obj);

    qdev_prop_set_drive(dev, "drive", blk, &err);

    if (err) {

        error_report("sd_init failed: %s", error_get_pretty(err));

        error_reportf_err(err, "sd_init failed: ");

        return NULL;

    }

    qdev_prop_set_bit(dev, "spi", is_spi);

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

    if (err) {

        error_report("sd_init failed: %s", error_get_pretty(err));

        error_reportf_err(err, "sd_init failed: ");

        return NULL;

    }

hw/usb/dev-mtp.c

+5 −4
Original line number Diff line number Diff line
@@ -631,8 +631,9 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject *o) 
        int64_t id = qemu_file_monitor_add_watch(s->file_monitor, o->path, NULL,

                                                 file_monitor_event, s, &err);

        if (id == -1) {

            error_report("usb-mtp: failed to add watch for %s: %s", o->path,

                         error_get_pretty(err));

            error_reportf_err(err,

                              "usb-mtp: failed to add watch for %s: ",

                              o->path);

            error_free(err);

        } else {

            trace_usb_mtp_file_monitor_event(s->dev.addr, o->path,
@@ -1276,8 +1277,8 @@ static void usb_mtp_command(MTPState *s, MTPControl *c) 


        s->file_monitor = qemu_file_monitor_new(&err);

        if (err) {

            error_report("usb-mtp: file monitoring init failed: %s",

                         error_get_pretty(err));

            error_reportf_err(err,

                              "usb-mtp: file monitoring init failed: ");

            error_free(err);

        } else {

            QTAILQ_INIT(&s->events);

qemu-nbd.c

+3 −4
Original line number Diff line number Diff line
@@ -856,8 +856,7 @@ int main(int argc, char **argv) 
        }

        tlscreds = nbd_get_tls_creds(tlscredsid, list, &local_err);

        if (local_err) {

            error_report("Failed to get TLS creds %s",

                         error_get_pretty(local_err));

            error_reportf_err(local_err, "Failed to get TLS creds: ");

            exit(EXIT_FAILURE);

        }

    } else {
@@ -983,8 +982,8 @@ int main(int argc, char **argv) 
                                             &local_err);

            if (sioc == NULL) {

                object_unref(OBJECT(server));

                error_report("Failed to use socket activation: %s",

                             error_get_pretty(local_err));

                error_reportf_err(local_err,

                                  "Failed to use socket activation: ");

                exit(EXIT_FAILURE);

            }

            qio_net_listener_add(server, sioc);