fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

migration/vmstate: stop reporting error number for new _errp APIs

Browse source 
The handlers .pre_load_errp, .post_load_errp and .pre_save_errp
should put all needed information into errp, we should not append
error number here.

Note, that there are some more error messages with numeric
error codes in this file. We leave them for another day, our
current goal is to prepare for the following commit, which will
update interface of _errp() APIs.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Link: https://lore.kernel.org/r/20251028170926.77219-1-vsementsov@yandex-team.ru
Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2025-10-28 20:09:25 +03:00 • committed by Peter Xu
parent 3469a56fa3
commit 507685984c
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
migration/vmstate.c
View file

@ -157,9 +157,9 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
ret = vmsd->pre_load_errp(opaque, errp);
if (ret < 0) {
error_prepend(errp, "pre load hook failed for: '%s', "
"version_id: %d, minimum version_id: %d, "
"ret: %d: ", vmsd->name, vmsd->version_id,
vmsd->minimum_version_id, ret);
"version_id: %d, minimum version_id: %d: ",
vmsd->name, vmsd->version_id,
vmsd->minimum_version_id);
return ret;
}
} else if (vmsd->pre_load) {
@ -259,8 +259,8 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
ret = vmsd->post_load_errp(opaque, version_id, errp);
if (ret < 0) {
error_prepend(errp, "post load hook failed for: %s, version_id: "
"%d, minimum_version: %d, ret: %d: ", vmsd->name,
vmsd->version_id, vmsd->minimum_version_id, ret);
"%d, minimum_version: %d: ", vmsd->name,
vmsd->version_id, vmsd->minimum_version_id);
}
} else if (vmsd->post_load) {
ret = vmsd->post_load(opaque, version_id);
@ -441,8 +441,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,
ret = vmsd->pre_save_errp(opaque, errp);
trace_vmstate_save_state_pre_save_res(vmsd->name, ret);
if (ret < 0) {
error_prepend(errp, "pre-save for %s failed, ret: %d: ",
vmsd->name, ret);
error_prepend(errp, "pre-save for %s failed: ", vmsd->name);
return ret;
}
} else if (vmsd->pre_save) {