Commit d32934c8 authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Edgar E. Iglesias
Browse files

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



Use fprintf(stderr instead. This removes dependency of libqemuutil.a
on the monitor.

We can further justify this change, in that this code path should only
trigger under a fatal error condition. fprintf-stderr is probably the
appropriate medium as under a fatal error conidition the monitor itself
may be down and out for the count. So assertion failure messages should
go lowest common denominator - straight to stderr.

Fixes the build as reported by Kevin Wolf. Issue debugged and change
suggested by Luiz Capitulino. Issue introduced by
5d24ee70.

Signed-off-by: default avatarPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
parent 133fe774

util/error.c

+4 −4
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...) 
    err->err_class = err_class;



    if (errp == &error_abort) {

        error_report("%s", error_get_pretty(err));

        fprintf(stderr, "%s\n", 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) {

        error_report("%s", error_get_pretty(err));

        fprintf(stderr, "%s\n", 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) {

        error_report("%s", error_get_pretty(err));

        fprintf(stderr, "%s\n", 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) {

        error_report("%s", error_get_pretty(local_err));

        fprintf(stderr, "%s\n", error_get_pretty(local_err));

        abort();

    } else if (dst_err && !*dst_err) {

        *dst_err = local_err;