qemufile: Always return a verbose error
There're a lot of cases where we only have an errno set in last_error but without a detailed error description. When this happens, try to generate an error contains the errno as a descriptive error. This will be helpful in cases where one relies on the Error*. E.g., migration state only caches Error* in MigrationState.error. With this, we'll display correct error messages in e.g. query-migrate when the error was only set by qemu_file_set_error(). Reviewed-by: Fabiano Rosas <farosas@suse.de> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com> Message-ID: <20231004220240.167175-6-peterx@redhat.com>
This commit is contained in:
parent
2b2f6f411e
commit
f4b897f485
|
@ -142,15 +142,24 @@ void qemu_file_set_hooks(QEMUFile *f, const QEMUFileHooks *hooks)
|
|||
*
|
||||
* Return negative error value if there has been an error on previous
|
||||
* operations, return 0 if no error happened.
|
||||
* Optional, it returns Error* in errp, but it may be NULL even if return value
|
||||
* is not 0.
|
||||
*
|
||||
* If errp is specified, a verbose error message will be copied over.
|
||||
*/
|
||||
static int qemu_file_get_error_obj(QEMUFile *f, Error **errp)
|
||||
{
|
||||
if (errp) {
|
||||
*errp = f->last_error_obj ? error_copy(f->last_error_obj) : NULL;
|
||||
if (!f->last_error) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* There is an error */
|
||||
if (errp) {
|
||||
if (f->last_error_obj) {
|
||||
*errp = error_copy(f->last_error_obj);
|
||||
} else {
|
||||
error_setg_errno(errp, -f->last_error, "Channel error");
|
||||
}
|
||||
}
|
||||
|
||||
return f->last_error;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue