[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/15] error: add global &error_warn destination
From: |
marcandre . lureau |
Subject: |
[PATCH v2 04/15] error: add global &error_warn destination |
Date: |
Tue, 21 Feb 2023 01:48:48 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
This can help debugging issues or develop, when error handling is
introduced.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qapi/error.h | 6 ++++++
util/error.c | 10 +++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/include/qapi/error.h b/include/qapi/error.h
index d798faeec3..f21a231bb1 100644
--- a/include/qapi/error.h
+++ b/include/qapi/error.h
@@ -519,6 +519,12 @@ static inline void
error_propagator_cleanup(ErrorPropagator *prop)
G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(ErrorPropagator, error_propagator_cleanup);
+/*
+ * Special error destination to warn on error.
+ * See error_setg() and error_propagate() for details.
+ */
+extern Error *error_warn;
+
/*
* Special error destination to abort on error.
* See error_setg() and error_propagate() for details.
diff --git a/util/error.c b/util/error.c
index 1e7af665b8..5537245da6 100644
--- a/util/error.c
+++ b/util/error.c
@@ -27,8 +27,9 @@ struct Error
Error *error_abort;
Error *error_fatal;
+Error *error_warn;
-static void error_handle_fatal(Error **errp, Error *err)
+static void error_handle(Error **errp, Error *err)
{
if (errp == &error_abort) {
fprintf(stderr, "Unexpected error in %s() at %s:%d:\n",
@@ -43,6 +44,9 @@ static void error_handle_fatal(Error **errp, Error *err)
error_report_err(err);
exit(1);
}
+ if (errp == &error_warn) {
+ warn_report_err(err);
+ }
}
G_GNUC_PRINTF(6, 0)
@@ -71,7 +75,7 @@ static void error_setv(Error **errp,
err->line = line;
err->func = func;
- error_handle_fatal(errp, err);
+ error_handle(errp, err);
*errp = err;
errno = saved_errno;
@@ -284,7 +288,7 @@ void error_propagate(Error **dst_errp, Error *local_err)
if (!local_err) {
return;
}
- error_handle_fatal(dst_errp, local_err);
+ error_handle(dst_errp, local_err);
if (dst_errp && !*dst_errp) {
*dst_errp = local_err;
} else {
--
2.39.1
- [PATCH v2 00/15] win32: do not mix SOCKET and fd space, marcandre . lureau, 2023/02/20
- [PATCH v2 01/15] util: drop qemu_fork(), marcandre . lureau, 2023/02/20
- [PATCH v2 02/15] tests: use closesocket(), marcandre . lureau, 2023/02/20
- [PATCH v2 03/15] io: use closesocket(), marcandre . lureau, 2023/02/20
- [PATCH v2 04/15] error: add global &error_warn destination,
marcandre . lureau <=
- [PATCH v2 07/15] aio: make aio_set_fd_poll() static to aio-posix.c, marcandre . lureau, 2023/02/20
- [PATCH v2 08/15] aio/win32: aio_set_fd_handler() only supports SOCKET, marcandre . lureau, 2023/02/20
- [PATCH v2 10/15] main-loop: remove qemu_fd_register(), win32/slirp/socket specific, marcandre . lureau, 2023/02/20
- [PATCH v2 12/15] slirp: open-code qemu_socket_(un)select(), marcandre . lureau, 2023/02/20
- [PATCH v2 09/15] RFC: build-sys: add slirp.wrap, marcandre . lureau, 2023/02/20
- [PATCH v2 11/15] slirp: unregister the win32 SOCKET, marcandre . lureau, 2023/02/20
- [PATCH v2 14/15] os-posix: remove useless ioctlsocket() define, marcandre . lureau, 2023/02/20
- [PATCH v2 13/15] win32: avoid mixing SOCKET and file descriptor space, marcandre . lureau, 2023/02/20
- [PATCH v2 15/15] win32: replace closesocket() with close() wrapper, marcandre . lureau, 2023/02/20