error: Don't decorate original error message when adding to it

Prepend the additional information, colon, space to the original
message without enclosing it in parenthesis or quotes, like we do
elsewhere.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1450452927-8346-11-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2015-12-18 16:35:13 +01:00
parent 8277d2aa58
commit 8aa802a6b7
4 changed files with 4 additions and 4 deletions

View File

@ -1063,7 +1063,7 @@ 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)",
error_report("Warning: global %s.%s=%s ignored: %s",
prop->driver, prop->property, prop->value,
error_get_pretty(err));
error_free(err);

View File

@ -2439,7 +2439,7 @@ static int img_snapshot(int argc, char **argv)
case SNAPSHOT_DELETE:
bdrv_snapshot_delete_by_id_or_name(bs, snapshot_name, &err);
if (err) {
error_report("Could not delete snapshot '%s': (%s)",
error_report("Could not delete snapshot '%s': %s",
snapshot_name, error_get_pretty(err));
error_free(err);
ret = 1;

View File

@ -832,7 +832,7 @@ int main(int argc, char **argv)
ctx = aio_context_new(&local_error);
if (!ctx) {
error_report("Failed to create AIO Context: '%s'",
error_report("Failed to create AIO Context: %s",
error_get_pretty(local_error));
error_free(local_error);
exit(1);

View File

@ -229,7 +229,7 @@ int main(int argc, char **argv)
ctx = aio_context_new(&local_error);
if (!ctx) {
error_report("Failed to create AIO Context: '%s'",
error_report("Failed to create AIO Context: %s",
error_get_pretty(local_error));
error_free(local_error);
exit(1);