| Message ID | 114579dc26f0dac15ddf699fe1f74cdfd6842894.1389756763.git.peter.crosthwaite@xilinx.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Jan 14, 2014 at 07:37:09PM -0800, Peter Crosthwaite wrote: > 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 > 5d24ee70bcbcf578614193526bcd5ed30a8eb16c. Applied, thanks > > Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> > --- > changed since v1: > Added "\n" (AF reivew) > > util/error.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/util/error.c b/util/error.c > index f11f1d5..e5de34f 100644 > --- a/util/error.c > +++ b/util/error.c > @@ -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; > -- > 1.8.5.3 > >
diff --git a/util/error.c b/util/error.c index f11f1d5..e5de34f 100644 --- a/util/error.c +++ b/util/error.c @@ -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;
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 5d24ee70bcbcf578614193526bcd5ed30a8eb16c. Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> --- changed since v1: Added "\n" (AF reivew) util/error.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)