[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v1 21/21] error: ensure errno detail is printed
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH v1 21/21] error: ensure errno detail is printed with error_abort |
Date: |
Wed, 9 Mar 2016 19:01:08 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 |
Ccing error.c maintainer.
Paolo
On 09/03/2016 18:28, Daniel P. Berrange wrote:
> When &error_abort is passed in, the error reporting code
> will print the current error message and then abort() the
> process. Unfortunately at the time it aborts, we've not
> yet appended the errno detail. This makes debugging certain
> problems significantly harder as the log is incomplete.
>
> Signed-off-by: Daniel P. Berrange <address@hidden>
> ---
> util/error.c | 40 +++++++++++++++++++---------------------
> 1 file changed, 19 insertions(+), 21 deletions(-)
>
> diff --git a/util/error.c b/util/error.c
> index 471b8b3..47f93af 100644
> --- a/util/error.c
> +++ b/util/error.c
> @@ -44,7 +44,8 @@ static void error_handle_fatal(Error **errp, Error *err)
>
> static void error_setv(Error **errp,
> const char *src, int line, const char *func,
> - ErrorClass err_class, const char *fmt, va_list ap)
> + ErrorClass err_class, const char *fmt, va_list ap,
> + const char *suffix)
> {
> Error *err;
> int saved_errno = errno;
> @@ -56,6 +57,11 @@ static void error_setv(Error **errp,
>
> err = g_malloc0(sizeof(*err));
> err->msg = g_strdup_vprintf(fmt, ap);
> + if (suffix) {
> + char *msg = err->msg;
> + err->msg = g_strdup_printf("%s: %s", msg, suffix);
> + g_free(msg);
> + }
> err->err_class = err_class;
> err->src = src;
> err->line = line;
> @@ -74,7 +80,7 @@ void error_set_internal(Error **errp,
> va_list ap;
>
> va_start(ap, fmt);
> - error_setv(errp, src, line, func, err_class, fmt, ap);
> + error_setv(errp, src, line, func, err_class, fmt, ap, NULL);
> va_end(ap);
> }
>
> @@ -85,7 +91,7 @@ void error_setg_internal(Error **errp,
> va_list ap;
>
> va_start(ap, fmt);
> - error_setv(errp, src, line, func, ERROR_CLASS_GENERIC_ERROR, fmt, ap);
> + error_setv(errp, src, line, func, ERROR_CLASS_GENERIC_ERROR, fmt, ap,
> NULL);
> va_end(ap);
> }
>
> @@ -94,7 +100,6 @@ void error_setg_errno_internal(Error **errp,
> int os_errno, const char *fmt, ...)
> {
> va_list ap;
> - char *msg;
> int saved_errno = errno;
>
> if (errp == NULL) {
> @@ -102,15 +107,10 @@ void error_setg_errno_internal(Error **errp,
> }
>
> va_start(ap, fmt);
> - error_setv(errp, src, line, func, ERROR_CLASS_GENERIC_ERROR, fmt, ap);
> + error_setv(errp, src, line, func, ERROR_CLASS_GENERIC_ERROR, fmt, ap,
> + os_errno != 0 ? strerror(os_errno) : NULL);
> va_end(ap);
>
> - if (os_errno != 0) {
> - msg = (*errp)->msg;
> - (*errp)->msg = g_strdup_printf("%s: %s", msg, strerror(os_errno));
> - g_free(msg);
> - }
> -
> errno = saved_errno;
> }
>
> @@ -174,24 +174,22 @@ void error_setg_win32_internal(Error **errp,
> int win32_err, const char *fmt, ...)
> {
> va_list ap;
> - char *msg1, *msg2;
> + char *suffix = NULL;
>
> if (errp == NULL) {
> return;
> }
>
> + if (win32_err != 0) {
> + suffix = g_win32_error_message(win32_err);
> + }
> +
> va_start(ap, fmt);
> - error_setv(errp, src, line, func, ERROR_CLASS_GENERIC_ERROR, fmt, ap);
> + error_setv(errp, src, line, func, ERROR_CLASS_GENERIC_ERROR,
> + fmt, ap, suffix);
> va_end(ap);
>
> - if (win32_err != 0) {
> - msg1 = (*errp)->msg;
> - msg2 = g_win32_error_message(win32_err);
> - (*errp)->msg = g_strdup_printf("%s: %s (error: %x)", msg1, msg2,
> - (unsigned)win32_err);
> - g_free(msg2);
> - g_free(msg1);
> - }
> + g_free(suffix);
> }
>
> #endif
>
- [Qemu-devel] [PATCH v1 16/21] char: remove qemu_chr_open_socket_fd method, (continued)
- [Qemu-devel] [PATCH v1 16/21] char: remove qemu_chr_open_socket_fd method, Daniel P. Berrange, 2016/03/09
- [Qemu-devel] [PATCH v1 19/21] osdep: remove use of socket_error() from all code, Daniel P. Berrange, 2016/03/09
- [Qemu-devel] [PATCH v1 18/21] osdep: remove use of Win32 specific closesocket/ioctlsocket, Daniel P. Berrange, 2016/03/09
- [Qemu-devel] [PATCH v1 20/21] osdep: remove direct use of qemu_socket & qemu_accept, Daniel P. Berrange, 2016/03/09
- [Qemu-devel] [PATCH v1 21/21] error: ensure errno detail is printed with error_abort, Daniel P. Berrange, 2016/03/09
- Re: [Qemu-devel] [PATCH v1 00/21] Multiple fixes & improves to QIOChannel & Win32, Paolo Bonzini, 2016/03/09