SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

migration/vmstate: Introduce vmstate_save_state_with_err

Browse Source 
Currently, a few code paths exist in the function vmstate_save_state_v,
which ultimately leads to a migration failure. However, an update in the
current MigrationState for the error description is never done.

vmstate.c somehow doesn't seem to allow	the use	of migrate_set_error due
to some	dependencies for unit tests. Hence, this patch introduces a new
function vmstate_save_state_with_err, which will eventually propagate
the error message to savevm.c where a migrate_set_error	call can be
eventually done.

Acked-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Tejus GK <tejus.gk@nutanix.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231003065538.244752-2-tejus.gk@nutanix.com>
This commit is contained in:
Tejus GK 2023-10-03 06:55:37 +00:00 committed by Juan Quintela
parent da1034094d
commit 969298f9d7
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/migration/vmstate.h
View File

@ -1196,9 +1196,11 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
void *opaque, int version_id); void *opaque, int version_id);
int vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd, int vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,
void *opaque, JSONWriter *vmdesc); void *opaque, JSONWriter *vmdesc);
int vmstate_save_state_with_err(QEMUFile *f, const VMStateDescription *vmsd,
void *opaque, JSONWriter *vmdesc, Error **errp);
int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd, int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,
void *opaque, JSONWriter *vmdesc, void *opaque, JSONWriter *vmdesc,
int version_id); int version_id, Error **errp);
bool vmstate_save_needed(const VMStateDescription *vmsd, void *opaque); bool vmstate_save_needed(const VMStateDescription *vmsd, void *opaque);

2
migration/savevm.c
View File

@ -1000,7 +1000,7 @@ static int vmstate_save(QEMUFile *f, SaveStateEntry *se, JSONWriter *vmdesc)
if (!se->vmsd) { if (!se->vmsd) {
vmstate_save_old_style(f, se, vmdesc); vmstate_save_old_style(f, se, vmdesc);
} else { } else {
ret = vmstate_save_state(f, se->vmsd, se->opaque, vmdesc); ret = vmstate_save_state_with_err(f, se->vmsd, se->opaque, vmdesc, &local_err);
if (ret) { if (ret) {
return ret; return ret;
} }

12
migration/vmstate.c
View File

@ -315,11 +315,17 @@ bool vmstate_save_needed(const VMStateDescription *vmsd, void *opaque)
int vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd, int vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd,
void *opaque, JSONWriter *vmdesc_id) void *opaque, JSONWriter *vmdesc_id)
{ {
return vmstate_save_state_v(f, vmsd, opaque, vmdesc_id, vmsd->version_id); return vmstate_save_state_v(f, vmsd, opaque, vmdesc_id, vmsd->version_id, NULL);
}
int vmstate_save_state_with_err(QEMUFile *f, const VMStateDescription *vmsd,
void *opaque, JSONWriter *vmdesc_id, Error **errp)
{
return vmstate_save_state_v(f, vmsd, opaque, vmdesc_id, vmsd->version_id, errp);
} }
int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd, int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,
void *opaque, JSONWriter *vmdesc, int version_id) void *opaque, JSONWriter *vmdesc, int version_id, Error **errp)
{ {
int ret = 0; int ret = 0;
const VMStateField *field = vmsd->fields; const VMStateField *field = vmsd->fields;
@ -377,7 +383,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,
} else if (field->flags & VMS_VSTRUCT) { } else if (field->flags & VMS_VSTRUCT) {
ret = vmstate_save_state_v(f, field->vmsd, curr_elem, ret = vmstate_save_state_v(f, field->vmsd, curr_elem,
vmdesc_loop, vmdesc_loop,
field->struct_version_id); field->struct_version_id, errp);
} else { } else {
ret = field->info->put(f, curr_elem, size, field, ret = field->info->put(f, curr_elem, size, field,
vmdesc_loop); vmdesc_loop);