From 50b7b000c9171c1253c1c875f46f654c3c0e1fc8 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 10 Sep 2015 10:19:16 -0600 Subject: hmp: Allow for error message hints on HMP Commits 7216ae3d and d2828429 disabled some error message hints, all because a change to use modern error reporting meant that the hint would be output prior to the actual error. Fix this by making hints a first-class member of Error. For example, we are now back to the pleasant: $ qemu-system-x86_64 --nodefaults -S --vnc :0 --chardev null,id=, qemu-system-x86_64: --chardev null,id=,: Parameter 'id' expects an identifier Identifiers consist of letters, digits, '-', '.', '_', starting with a letter. Signed-off-by: Eric Blake Reviewed-by: Paolo Bonzini Message-Id: <1441901956-21991-1-git-send-email-eblake@redhat.com> Signed-off-by: Markus Armbruster --- util/error.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'util/error.c') diff --git a/util/error.c b/util/error.c index cdb726ce81..9dd474f3be 100644 --- a/util/error.c +++ b/util/error.c @@ -20,6 +20,7 @@ struct Error ErrorClass err_class; const char *src, *func; int line; + GString *hint; }; Error *error_abort; @@ -115,6 +116,28 @@ void error_setg_file_open_internal(Error **errp, "Could not open '%s'", filename); } +void error_append_hint(Error **errp, const char *fmt, ...) +{ + va_list ap; + int saved_errno = errno; + Error *err; + + if (!errp) { + return; + } + err = *errp; + assert(err && errp != &error_abort); + + if (!err->hint) { + err->hint = g_string_new(NULL); + } + va_start(ap, fmt); + g_string_append_vprintf(err->hint, fmt, ap); + va_end(ap); + + errno = saved_errno; +} + #ifdef _WIN32 void error_setg_win32_internal(Error **errp, @@ -151,6 +174,9 @@ Error *error_copy(const Error *err) err_new = g_malloc0(sizeof(*err)); err_new->msg = g_strdup(err->msg); err_new->err_class = err->err_class; + if (err->hint) { + err_new->hint = g_string_new(err->hint->str); + } return err_new; } @@ -168,6 +194,9 @@ const char *error_get_pretty(Error *err) void error_report_err(Error *err) { error_report("%s", error_get_pretty(err)); + if (err->hint) { + error_printf_unless_qmp("%s\n", err->hint->str); + } error_free(err); } @@ -175,6 +204,9 @@ void error_free(Error *err) { if (err) { g_free(err->msg); + if (err->hint) { + g_string_free(err->hint, true); + } g_free(err); } } -- cgit v1.2.3-55-g7522 From 88e2ce291595ed8f12636b40523fdb215a9d3374 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 10 Sep 2015 10:34:50 -0600 Subject: error: Copy location information in error_copy() Commit 1e9b65bb forgot to propagate source information to copied errors. Signed-off-by: Eric Blake Message-Id: <1441902890-23064-1-git-send-email-eblake@redhat.com> Signed-off-by: Markus Armbruster --- util/error.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'util/error.c') diff --git a/util/error.c b/util/error.c index 9dd474f3be..b1eb8a288b 100644 --- a/util/error.c +++ b/util/error.c @@ -174,6 +174,9 @@ Error *error_copy(const Error *err) err_new = g_malloc0(sizeof(*err)); err_new->msg = g_strdup(err->msg); err_new->err_class = err->err_class; + err_new->src = err->src; + err_new->line = err->line; + err_new->func = err->func; if (err->hint) { err_new->hint = g_string_new(err->hint->str); } -- cgit v1.2.3-55-g7522 From a29a37b994ca3c5a1d39fa0e8934f7e0f2cf57ef Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 11 Sep 2015 16:51:42 +0200 Subject: error: New error_fatal Similar to error_abort, but doesn't report where the error was created, and terminates the process with exit(1) rather than abort(). Signed-off-by: Markus Armbruster Message-Id: <1441983105-26376-2-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake Reviewed-by: Peter Crosthwaite --- include/qapi/error.h | 11 +++++++++++ util/error.c | 34 +++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 13 deletions(-) (limited to 'util/error.c') diff --git a/include/qapi/error.h b/include/qapi/error.h index d7878c3088..c69dddbbf2 100644 --- a/include/qapi/error.h +++ b/include/qapi/error.h @@ -50,6 +50,9 @@ * Call a function aborting on errors: * foo(arg, &error_abort); * + * Call a function treating errors as fatal: + * foo(arg, &error_fatal); + * * Receive an error and pass it on to the caller: * Error *err = NULL; * foo(arg, &err); @@ -100,6 +103,7 @@ ErrorClass error_get_class(const Error *err); * If @errp is NULL, the error is ignored. Don't bother creating one * then. * If @errp is &error_abort, print a suitable message and abort(). + * If @errp is &error_fatal, print a suitable message and exit(1). * If @errp is anything else, *@errp must be NULL. * The new error's class is ERROR_CLASS_GENERIC_ERROR, and its * human-readable error message is made from printf-style @fmt, ... @@ -148,6 +152,8 @@ void error_setg_win32_internal(Error **errp, * error object. * Else, if @dst_errp is &error_abort, print a suitable message and * abort(). + * Else, if @dst_errp is &error_fatal, print a suitable message and + * exit(1). * Else, if @dst_errp already contains an error, ignore this one: free * the error object. * Else, move the error object from @local_err to *@dst_errp. @@ -206,4 +212,9 @@ void error_set_internal(Error **errp, */ extern Error *error_abort; +/* + * Pass to error_setg() & friends to exit(1) on error. + */ +extern Error *error_fatal; + #endif diff --git a/util/error.c b/util/error.c index b1eb8a288b..8b86490ba1 100644 --- a/util/error.c +++ b/util/error.c @@ -2,9 +2,11 @@ * QEMU Error Objects * * Copyright IBM, Corp. 2011 + * Copyright (C) 2011-2015 Red Hat, Inc. * * Authors: * Anthony Liguori + * Markus Armbruster , * * This work is licensed under the terms of the GNU LGPL, version 2. See * the COPYING.LIB file in the top-level directory. @@ -24,13 +26,20 @@ struct Error }; Error *error_abort; +Error *error_fatal; -static void error_do_abort(Error *err) +static void error_handle_fatal(Error **errp, Error *err) { - fprintf(stderr, "Unexpected error in %s() at %s:%d:\n", - err->func, err->src, err->line); - error_report_err(err); - abort(); + if (errp == &error_abort) { + fprintf(stderr, "Unexpected error in %s() at %s:%d:\n", + err->func, err->src, err->line); + error_report_err(err); + abort(); + } + if (errp == &error_fatal) { + error_report_err(err); + exit(1); + } } static void error_setv(Error **errp, @@ -52,10 +61,7 @@ static void error_setv(Error **errp, err->line = line; err->func = func; - if (errp == &error_abort) { - error_do_abort(err); - } - + error_handle_fatal(errp, err); *errp = err; errno = saved_errno; @@ -216,11 +222,13 @@ void error_free(Error *err) void error_propagate(Error **dst_errp, Error *local_err) { - if (local_err && dst_errp == &error_abort) { - error_do_abort(local_err); - } else if (dst_errp && !*dst_errp) { + if (!local_err) { + return; + } + error_handle_fatal(dst_errp, local_err); + if (dst_errp && !*dst_errp) { *dst_errp = local_err; - } else if (local_err) { + } else { error_free(local_err); } } -- cgit v1.2.3-55-g7522