[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qmp v4 1/6] error: Add error_abort
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH qmp v4 1/6] error: Add error_abort |
Date: |
Wed, 1 Jan 2014 18:46:59 -0800 |
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 <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
changed since v2:
Reverted to v1 (no delayed assertion) (Markus review)
changed since v1:
Delayed assertions that *errp == NULL.
include/qapi/error.h | 6 ++++++
util/error.c | 22 +++++++++++++++++++++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/include/qapi/error.h b/include/qapi/error.h
index 7d4c696..c0f0c3b 100644
--- a/include/qapi/error.h
+++ b/include/qapi/error.h
@@ -95,4 +95,10 @@ void error_propagate(Error **dst_err, Error *local_err);
*/
void error_free(Error *err);
+/**
+ * If passed to error_set and friends, abort().
+ */
+
+extern Error *error_abort;
+
#endif
diff --git a/util/error.c b/util/error.c
index 3ee362a..f11f1d5 100644
--- a/util/error.c
+++ b/util/error.c
@@ -23,6 +23,8 @@ struct Error
ErrorClass err_class;
};
+Error *error_abort;
+
void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...)
{
Error *err;
@@ -41,6 +43,11 @@ void error_set(Error **errp, ErrorClass err_class, const
char *fmt, ...)
va_end(ap);
err->err_class = err_class;
+ if (errp == &error_abort) {
+ error_report("%s", error_get_pretty(err));
+ abort();
+ }
+
*errp = err;
errno = saved_errno;
@@ -72,6 +79,11 @@ void error_set_errno(Error **errp, int os_errno, ErrorClass
err_class,
va_end(ap);
err->err_class = err_class;
+ if (errp == &error_abort) {
+ error_report("%s", error_get_pretty(err));
+ abort();
+ }
+
*errp = err;
errno = saved_errno;
@@ -112,6 +124,11 @@ void error_set_win32(Error **errp, int win32_err,
ErrorClass err_class,
va_end(ap);
err->err_class = err_class;
+ if (errp == &error_abort) {
+ error_report("%s", error_get_pretty(err));
+ abort();
+ }
+
*errp = err;
}
@@ -153,7 +170,10 @@ void error_free(Error *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;
} else if (local_err) {
error_free(local_err);
--
1.8.5.2
- [Qemu-devel] [PATCH qmp v4 0/6] Add error_abort and associated cleanups, Peter Crosthwaite, 2014/01/01
- [Qemu-devel] [PATCH qmp v4 1/6] error: Add error_abort,
Peter Crosthwaite <=
- [Qemu-devel] [PATCH qmp v4 2/6] hw/core/qdev: Delete dead code, Peter Crosthwaite, 2014/01/01
- [Qemu-devel] [PATCH qmp v4 3/6] hw: Remove assert_no_error usages, Peter Crosthwaite, 2014/01/01
- [Qemu-devel] [PATCH qmp v4 4/6] target-i386: Remove assert_no_error usage, Peter Crosthwaite, 2014/01/01
- [Qemu-devel] [PATCH qmp v4 5/6] qemu-option: Remove qemu_opts_create_nofail, Peter Crosthwaite, 2014/01/01
- [Qemu-devel] [PATCH qmp v4 6/6] qerror: Remove assert_no_error(), Peter Crosthwaite, 2014/01/01
- Re: [Qemu-devel] [PATCH qmp v4 0/6] Add error_abort and associated cleanups, Luiz Capitulino, 2014/01/06