diff options
| -rw-r--r-- | block/sheepdog.c | 3 | ||||
| -rw-r--r-- | hw/arm/imx25_pdk.c | 2 | ||||
| -rw-r--r-- | hw/arm/kzm.c | 2 | ||||
| -rw-r--r-- | hw/arm/netduino2.c | 2 | ||||
| -rw-r--r-- | hw/arm/xlnx-ep108.c | 2 | ||||
| -rw-r--r-- | hw/ppc/spapr_drc.c | 6 | ||||
| -rw-r--r-- | qemu-nbd.c | 2 | ||||
| -rw-r--r-- | vl.c | 2 |
8 files changed, 9 insertions, 12 deletions
diff --git a/block/sheepdog.c b/block/sheepdog.c index d80e4ed18d..dd8301bdbd 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -1861,8 +1861,7 @@ static int sd_create(const char *filename, QemuOpts *opts, 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 = -EIO; goto out; } diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index 59a4c11277..039f0ebdb8 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -75,7 +75,7 @@ static void imx25_pdk_init(MachineState *machine) object_property_set_bool(OBJECT(&s->soc), true, "realized", &err); if (err != NULL) { - error_report("%s", error_get_pretty(err)); + error_report_err(err); exit(1); } diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index eff6f4681d..f4b463aa1e 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -74,7 +74,7 @@ static void kzm_init(MachineState *machine) object_property_set_bool(OBJECT(&s->soc), true, "realized", &err); if (err != NULL) { - error_report("%s", error_get_pretty(err)); + error_report_err(err); exit(1); } diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index a3b9e82ff4..3ab83a1acd 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -38,7 +38,7 @@ static void netduino2_init(MachineState *machine) qdev_prop_set_string(dev, "cpu-model", "cortex-m3"); object_property_set_bool(OBJECT(dev), true, "realized", &err); if (err != NULL) { - error_report("%s", error_get_pretty(err)); + error_report_err(err); exit(1); } } diff --git a/hw/arm/xlnx-ep108.c b/hw/arm/xlnx-ep108.c index 85b978fa76..73e60876e8 100644 --- a/hw/arm/xlnx-ep108.c +++ b/hw/arm/xlnx-ep108.c @@ -41,7 +41,7 @@ static void xlnx_ep108_init(MachineState *machine) object_property_set_bool(OBJECT(&s->soc), true, "realized", &err); if (err) { - error_report("%s", error_get_pretty(err)); + error_report_err(err); exit(1); } diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 8be62c349b..4fb86a68c4 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -465,8 +465,7 @@ static void realize(DeviceState *d, Error **errp) object_property_add_alias(root_container, link_name, drc->owner, child_name, &err); if (err) { - error_report("%s", error_get_pretty(err)); - error_free(err); + error_report_err(err); object_unref(OBJECT(drc)); } g_free(child_name); @@ -486,8 +485,7 @@ static void unrealize(DeviceState *d, Error **errp) snprintf(name, sizeof(name), "%x", drck->get_index(drc)); object_property_del(root_container, name, &err); if (err) { - error_report("%s", error_get_pretty(err)); - error_free(err); + error_report_err(err); object_unref(OBJECT(drc)); } } diff --git a/qemu-nbd.c b/qemu-nbd.c index d5c32deab1..65c0ebda04 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -749,7 +749,7 @@ int main(int argc, char **argv) exp = nbd_export_new(blk, dev_offset, fd_size, nbdflags, nbd_export_closed, &local_err); if (!exp) { - error_report("%s", error_get_pretty(local_err)); + error_report_err(local_err); exit(EXIT_FAILURE); } @@ -4553,7 +4553,7 @@ int main(int argc, char **argv, char **envp) Error *local_err = NULL; qemu_boot_set(boot_once, &local_err); if (local_err) { - error_report("%s", error_get_pretty(local_err)); + error_report_err(local_err); exit(1); } qemu_register_reset(restore_boot_order, g_strdup(boot_order)); |