mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

error: Use error_reportf_err() where appropriate

Browse Source 
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: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200505101908.6207-6-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-05-05 12:19:03 +02:00
parent d01127584e
commit 5217f1887a
6 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chardev/char-socket.c
View File

@ -138,8 +138,9 @@ static void check_report_connect_error(Chardev *chr,
SocketChardev *s = SOCKET_CHARDEV(chr); SocketChardev *s = SOCKET_CHARDEV(chr);
if (!s->connect_err_reported) { if (!s->connect_err_reported) {
error_report("Unable to connect character device %s: %s", error_reportf_err(err,
chr->label, error_get_pretty(err)); "Unable to connect character device %s: ",
chr->label);
s->connect_err_reported = true; s->connect_err_reported = true;
} }
qemu_chr_socket_restart_timer(chr); qemu_chr_socket_restart_timer(chr);

4
hw/sd/pxa2xx_mmci.c
View File

@ -497,12 +497,12 @@ PXA2xxMMCIState *pxa2xx_mmci_init(MemoryRegion *sysmem,
carddev = qdev_create(qdev_get_child_bus(dev, "sd-bus"), TYPE_SD_CARD); carddev = qdev_create(qdev_get_child_bus(dev, "sd-bus"), TYPE_SD_CARD);
qdev_prop_set_drive(carddev, "drive", blk, &err); qdev_prop_set_drive(carddev, "drive", blk, &err);
if (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; return NULL;
} }
object_property_set_bool(OBJECT(carddev), true, "realized", &err); object_property_set_bool(OBJECT(carddev), true, "realized", &err);
if (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; return NULL;
} }

4
hw/sd/sd.c
View File

@ -703,13 +703,13 @@ SDState *sd_init(BlockBackend *blk, bool is_spi)
dev = DEVICE(obj); dev = DEVICE(obj);
qdev_prop_set_drive(dev, "drive", blk, &err); qdev_prop_set_drive(dev, "drive", blk, &err);
if (err) { if (err) {
error_report("sd_init failed: %s", error_get_pretty(err)); error_reportf_err(err, "sd_init failed: ");
return NULL; return NULL;
} }
qdev_prop_set_bit(dev, "spi", is_spi); qdev_prop_set_bit(dev, "spi", is_spi);
object_property_set_bool(obj, true, "realized", &err); object_property_set_bool(obj, true, "realized", &err);
if (err) { if (err) {
error_report("sd_init failed: %s", error_get_pretty(err)); error_reportf_err(err, "sd_init failed: ");
return NULL; return NULL;
} }

9
hw/usb/dev-mtp.c
View File

@ -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, int64_t id = qemu_file_monitor_add_watch(s->file_monitor, o->path, NULL,
file_monitor_event, s, &err); file_monitor_event, s, &err);
if (id == -1) { if (id == -1) {
error_report("usb-mtp: failed to add watch for %s: %s", o->path, error_reportf_err(err,
error_get_pretty(err)); "usb-mtp: failed to add watch for %s: ",
o->path);
error_free(err); error_free(err);
} else { } else {
trace_usb_mtp_file_monitor_event(s->dev.addr, o->path, 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); s->file_monitor = qemu_file_monitor_new(&err);
if (err) { if (err) {
error_report("usb-mtp: file monitoring init failed: %s", error_reportf_err(err,
error_get_pretty(err)); "usb-mtp: file monitoring init failed: ");
error_free(err); error_free(err);
} else { } else {
QTAILQ_INIT(&s->events); QTAILQ_INIT(&s->events);

7
qemu-nbd.c
View File

@ -856,8 +856,7 @@ int main(int argc, char **argv)
} }
tlscreds = nbd_get_tls_creds(tlscredsid, list, &local_err); tlscreds = nbd_get_tls_creds(tlscredsid, list, &local_err);
if (local_err) { if (local_err) {
error_report("Failed to get TLS creds %s", error_reportf_err(local_err, "Failed to get TLS creds: ");
error_get_pretty(local_err));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} else { } else {
@ -983,8 +982,8 @@ int main(int argc, char **argv)
&local_err); &local_err);
if (sioc == NULL) { if (sioc == NULL) {
object_unref(OBJECT(server)); object_unref(OBJECT(server));
error_report("Failed to use socket activation: %s", error_reportf_err(local_err,
error_get_pretty(local_err)); "Failed to use socket activation: ");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
qio_net_listener_add(server, sioc); qio_net_listener_add(server, sioc);

4
scsi/qemu-pr-helper.c
View File

@ -1030,8 +1030,8 @@ int main(int argc, char **argv)
server_ioc = qio_channel_socket_new_fd(FIRST_SOCKET_ACTIVATION_FD, server_ioc = qio_channel_socket_new_fd(FIRST_SOCKET_ACTIVATION_FD,
&local_err); &local_err);
if (server_ioc == NULL) { if (server_ioc == NULL) {
error_report("Failed to use socket activation: %s", error_reportf_err(local_err,
error_get_pretty(local_err)); "Failed to use socket activation: ");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }