mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 23:33:54 -06:00
hmp: Allow for error message hints on HMP
Commits7216ae3d
andd2828429
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 <eblake@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <1441901956-21991-1-git-send-email-eblake@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
615cf669b5
commit
50b7b000c9
4 changed files with 57 additions and 35 deletions
32
util/error.c
32
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);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue