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

migration: Remove section_id parameter from vmstate_load

Browse Source 
Everything else assumes that we always load a device from its own
savevm handler.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela 2017-05-24 09:28:47 +02:00
parent c2355ad47d
commit 3a011c26bc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
migration/savevm.c
View File

@ -746,13 +746,13 @@ void vmstate_unregister(DeviceState *dev, const VMStateDescription *vmsd,
} }
} }
static int vmstate_load(QEMUFile *f, SaveStateEntry *se, int version_id) static int vmstate_load(QEMUFile *f, SaveStateEntry *se)
{ {
trace_vmstate_load(se->idstr, se->vmsd ? se->vmsd->name : "(old)"); trace_vmstate_load(se->idstr, se->vmsd ? se->vmsd->name : "(old)");
if (!se->vmsd) { /* Old style */ if (!se->vmsd) { /* Old style */
return se->ops->load_state(f, se->opaque, version_id); return se->ops->load_state(f, se->opaque, se->load_version_id);
} }
return vmstate_load_state(f, se->vmsd, se->opaque, version_id); return vmstate_load_state(f, se->vmsd, se->opaque, se->load_version_id);
} }
static void vmstate_save_old_style(QEMUFile *f, SaveStateEntry *se, QJSON *vmdesc) static void vmstate_save_old_style(QEMUFile *f, SaveStateEntry *se, QJSON *vmdesc)
@ -1882,7 +1882,7 @@ qemu_loadvm_section_start_full(QEMUFile *f, MigrationIncomingState *mis)
return -EINVAL; return -EINVAL;
} }
ret = vmstate_load(f, se, se->load_version_id); ret = vmstate_load(f, se);
if (ret < 0) { if (ret < 0) {
error_report("error while loading state for instance 0x%x of" error_report("error while loading state for instance 0x%x of"
" device '%s'", instance_id, idstr); " device '%s'", instance_id, idstr);
@ -1915,7 +1915,7 @@ qemu_loadvm_section_part_end(QEMUFile *f, MigrationIncomingState *mis)
return -EINVAL; return -EINVAL;
} }
ret = vmstate_load(f, se, se->load_version_id); ret = vmstate_load(f, se);
if (ret < 0) { if (ret < 0) {
error_report("error while loading state section id %d(%s)", error_report("error while loading state section id %d(%s)",
section_id, se->idstr); section_id, se->idstr);