mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

error: Fix error_report_err(), warn_report_err() hint printing

Browse Source 
Before the from qerror_report() to error_setg(), hints looked like
this:

    qerror_report(QERR_MACRO, ... arguments ...);
    error_printf_unless_qmp(... hint ...);

error_printf_unless_qmp() made perfect sense: it printed exactly when
qerror_report() did.

After the conversion to error_setg():

    error_setg(errp, QERR_MACRO, ... arguments ...);
    error_printf_unless_qmp(... hint ...);

The "unless QMP part" still made some sense; in QMP context, the
caller generally uses the error as QMP response instead of printing
it.

However, everything else is wrong.  If the caller handles the error,
the hint gets printed anyway (unless QMP).  If the caller reports the
error, the hint gets printed *before* the report (unless QMP) or not
at all (if QMP).

Commit 50b7b000c9 fixed this by making hints a member of Error.  It
kept printing hints with error_printf_unless_qmp():

     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);
     }

This is wrong.  We should (and now can) print the hint exactly when we
print the error.

The mistake has since been copied to warn_report_err() in commit
e43ead1d0b.

Fix both to use error_printf().

Reported-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Cc: Eric Blake <eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190416153850.5186-1-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
[Commit message tweaked]
This commit is contained in:
Markus Armbruster 2019-04-16 17:38:50 +02:00
parent f5852efa29
commit 4c8b7c8b25
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/error.c
View File

@ -223,7 +223,7 @@ void error_report_err(Error *err)
{ {
error_report("%s", error_get_pretty(err)); error_report("%s", error_get_pretty(err));
if (err->hint) { if (err->hint) {
error_printf_unless_qmp("%s", err->hint->str); error_printf("%s", err->hint->str);
} }
error_free(err); error_free(err);
} }
@ -232,7 +232,7 @@ void warn_report_err(Error *err)
{ {
warn_report("%s", error_get_pretty(err)); warn_report("%s", error_get_pretty(err));
if (err->hint) { if (err->hint) {
error_printf_unless_qmp("%s", err->hint->str); error_printf("%s", err->hint->str);
} }
error_free(err); error_free(err);
} }