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

Revert "error: Don't use error_report() for assertion msgs."

Browse Source 
This reverts commit d32934c84c.

The original implementation before this patch makes abortive error
messages much more friendly. The underlying bug that required this
change is now fixed. Revert.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
This commit is contained in:
Peter Crosthwaite 2014-01-15 03:06:11 -08:00 committed by Edgar E. Iglesias
parent 3dbe85b840
commit 732c66ce64
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/error.c
View File

@ -44,7 +44,7 @@ void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...)
err->err_class = err_class;
if (errp == &error_abort) {
fprintf(stderr, "%s\n", error_get_pretty(err));
error_report("%s", error_get_pretty(err));
abort();
}
@ -80,7 +80,7 @@ void error_set_errno(Error **errp, int os_errno, ErrorClass err_class,
err->err_class = err_class;
if (errp == &error_abort) {
fprintf(stderr, "%s\n", error_get_pretty(err));
error_report("%s", error_get_pretty(err));
abort();
}
@ -125,7 +125,7 @@ void error_set_win32(Error **errp, int win32_err, ErrorClass err_class,
err->err_class = err_class;
if (errp == &error_abort) {
fprintf(stderr, "%s\n", error_get_pretty(err));
error_report("%s", error_get_pretty(err));
abort();
}
@ -171,7 +171,7 @@ void error_free(Error *err)
void error_propagate(Error **dst_err, Error *local_err)
{
if (local_err && dst_err == &error_abort) {
fprintf(stderr, "%s\n", error_get_pretty(local_err));
error_report("%s", error_get_pretty(local_err));
abort();
} else if (dst_err && !*dst_err) {
*dst_err = local_err;