error: Add error_abort
Add a special Error * that can be passed to error handling APIs to signal that any errors are fatal and should abort QEMU. There are two advantages to this: - allows for brevity when wishing to assert success of Error ** accepting APIs. No need for this pattern: Error * local_err = NULL; api_call(foo, bar, &local_err); assert_no_error(local_err); This also removes the need for _nofail variants of APIs with asserting call sites now reduced to 1LOC. - SIGABRT happens from within the offending API. When a fatal error occurs in an API call (when the caller is asserting sucess) failure often means the API itself is broken. With the abort happening in the API call now, the stack frames into the call are available at debug time. In the assert_no_error scheme the abort happens after the fact. The exact semantic is that when an error is raised, if the argument Error ** matches &error_abort, then the abort occurs immediately. The error messaged is reported. For error_propagate, if the destination error is &error_abort, then the abort happens at propagation time. Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
parent
cff8b2c6fc
commit
5d24ee70bc
@ -95,4 +95,10 @@ void error_propagate(Error **dst_err, Error *local_err);
|
|||||||
*/
|
*/
|
||||||
void error_free(Error *err);
|
void error_free(Error *err);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If passed to error_set and friends, abort().
|
||||||
|
*/
|
||||||
|
|
||||||
|
extern Error *error_abort;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
22
util/error.c
22
util/error.c
@ -23,6 +23,8 @@ struct Error
|
|||||||
ErrorClass err_class;
|
ErrorClass err_class;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Error *error_abort;
|
||||||
|
|
||||||
void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...)
|
void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
Error *err;
|
Error *err;
|
||||||
@ -41,6 +43,11 @@ void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...)
|
|||||||
va_end(ap);
|
va_end(ap);
|
||||||
err->err_class = err_class;
|
err->err_class = err_class;
|
||||||
|
|
||||||
|
if (errp == &error_abort) {
|
||||||
|
error_report("%s", error_get_pretty(err));
|
||||||
|
abort();
|
||||||
|
}
|
||||||
|
|
||||||
*errp = err;
|
*errp = err;
|
||||||
|
|
||||||
errno = saved_errno;
|
errno = saved_errno;
|
||||||
@ -72,6 +79,11 @@ void error_set_errno(Error **errp, int os_errno, ErrorClass err_class,
|
|||||||
va_end(ap);
|
va_end(ap);
|
||||||
err->err_class = err_class;
|
err->err_class = err_class;
|
||||||
|
|
||||||
|
if (errp == &error_abort) {
|
||||||
|
error_report("%s", error_get_pretty(err));
|
||||||
|
abort();
|
||||||
|
}
|
||||||
|
|
||||||
*errp = err;
|
*errp = err;
|
||||||
|
|
||||||
errno = saved_errno;
|
errno = saved_errno;
|
||||||
@ -112,6 +124,11 @@ void error_set_win32(Error **errp, int win32_err, ErrorClass err_class,
|
|||||||
va_end(ap);
|
va_end(ap);
|
||||||
err->err_class = err_class;
|
err->err_class = err_class;
|
||||||
|
|
||||||
|
if (errp == &error_abort) {
|
||||||
|
error_report("%s", error_get_pretty(err));
|
||||||
|
abort();
|
||||||
|
}
|
||||||
|
|
||||||
*errp = err;
|
*errp = err;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -153,7 +170,10 @@ void error_free(Error *err)
|
|||||||
|
|
||||||
void error_propagate(Error **dst_err, Error *local_err)
|
void error_propagate(Error **dst_err, Error *local_err)
|
||||||
{
|
{
|
||||||
if (dst_err && !*dst_err) {
|
if (local_err && dst_err == &error_abort) {
|
||||||
|
error_report("%s", error_get_pretty(local_err));
|
||||||
|
abort();
|
||||||
|
} else if (dst_err && !*dst_err) {
|
||||||
*dst_err = local_err;
|
*dst_err = local_err;
|
||||||
} else if (local_err) {
|
} else if (local_err) {
|
||||||
error_free(local_err);
|
error_free(local_err);
|
||||||
|
Loading…
Reference in New Issue
Block a user