motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-09 00:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

error: New error_prepend(), error_reportf_err()

Browse source 
Instead of simply propagating an error verbatim, we sometimes want to
add to its message, like this:

    frobnicate(arg, &err);
    error_setg(errp, "Can't frobnicate %s: %s",
                     arg, error_get_pretty(err));
    error_free(err);

This is suboptimal, because it loses err's hint (if any).  Moreover,
when errp is &error_abort or is subsequently propagated to
&error_abort, the abort message points to the place where we last
added to the error, not to the place where it originated.

To avoid these issues, provide means to add to an error's message in
place:

    frobnicate(arg, errp);
    error_prepend(errp, "Can't frobnicate %s: ", arg);

Likewise, reporting an error like

    frobnicate(arg, &err);
    error_report("Can't frobnicate %s: %s", arg, error_get_pretty(err));

can lose err's hint.  To avoid:

    error_reportf_err(err, "Can't frobnicate %s: ", arg);

The next commits will put these functions to use.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1450452927-8346-10-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2015-12-18 16:35:12 +01:00
parent 73eaa04777
commit 8277d2aa58
2 changed files with 62 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

33
util/error.c
View file

@ -122,6 +122,29 @@ void error_setg_file_open_internal(Error **errp,
"Could not open '%s'", filename);
}
void error_vprepend(Error **errp, const char *fmt, va_list ap)
{
GString *newmsg;
if (!errp) {
return;
}
newmsg = g_string_new(NULL);
g_string_vprintf(newmsg, fmt, ap);
g_string_append(newmsg, (*errp)->msg);
(*errp)->msg = g_string_free(newmsg, 0);
}
void error_prepend(Error **errp, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
error_vprepend(errp, fmt, ap);
va_end(ap);
}
void error_append_hint(Error **errp, const char *fmt, ...)
{
va_list ap;
@ -209,6 +232,16 @@ void error_report_err(Error *err)
error_free(err);
}
void error_reportf_err(Error *err, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
error_vprepend(&err, fmt, ap);
va_end(ap);
error_report_err(err);
}
void error_free(Error *err)
{
if (err) {