diff options
| author | Markus Armbruster | 2015-12-18 16:35:14 +0100 |
|---|---|---|
| committer | Markus Armbruster | 2016-01-13 15:16:17 +0100 |
| commit | c29b77f955ff2f7b57c1e71e9dc26243eefd0b28 (patch) | |
| tree | c76f9b9338d5a1cefef00917260242c4d04285c5 /hw/core | |
| parent | error: Don't decorate original error message when adding to it (diff) | |
| download | qemu-c29b77f955ff2f7b57c1e71e9dc26243eefd0b28.tar.gz qemu-c29b77f955ff2f7b57c1e71e9dc26243eefd0b28.tar.xz qemu-c29b77f955ff2f7b57c1e71e9dc26243eefd0b28.zip | |
error: Use error_reportf_err() where it makes obvious sense
Done with this Coccinelle semantic patch
@@
expression FMT, E, S;
expression list ARGS;
@@
- error_report(FMT, ARGS, error_get_pretty(E));
+ error_reportf_err(E, FMT/*@@@*/, ARGS);
(
- error_free(E);
|
exit(S);
|
abort();
)
followed by a replace of '%s"/*@@@*/' by '"' and some line rewrapping,
because I can't figure out how to make Coccinelle transform strings.
We now use the error whole instead of just its message obtained with
error_get_pretty(). This avoids suppressing its hint (see commit
50b7b00), but I can't see how the errors touched in this commit could
come with hints.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1450452927-8346-12-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'hw/core')
| -rw-r--r-- | hw/core/qdev-properties.c | 6 | ||||
| -rw-r--r-- | hw/core/qdev.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index fffb58efb3..3572810b42 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1063,10 +1063,8 @@ static void qdev_prop_set_globals_for_type(DeviceState *dev, object_property_parse(OBJECT(dev), prop->value, prop->property, &err); if (err != NULL) { assert(prop->user_provided); - error_report("Warning: global %s.%s=%s ignored: %s", - prop->driver, prop->property, prop->value, - error_get_pretty(err)); - error_free(err); + error_reportf_err(err, "Warning: global %s.%s=%s ignored: ", + prop->driver, prop->property, prop->value); return; } } diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 4e3173d81a..2c7101d91d 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -370,9 +370,8 @@ void qdev_init_nofail(DeviceState *dev) object_property_set_bool(OBJECT(dev), true, "realized", &err); if (err) { - error_report("Initialization of device %s failed: %s", - object_get_typename(OBJECT(dev)), - error_get_pretty(err)); + error_reportf_err(err, "Initialization of device %s failed: ", + object_get_typename(OBJECT(dev))); exit(1); } } |