diff options
| author | Juan Quintela <quintela@redhat.com> | 2017-05-24 09:28:47 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-06-01 18:31:13 +0200 |
| commit | 3a011c26bc74ab0fb4b5289a10fff13e46a02e8c (patch) | |
| tree | ce82ac0ccd700edb76dbba6e2a89437c9e8be3d7 /migration | |
| parent | c2355ad47d60d04efb640de57cd719cb24ebe563 (diff) | |
| download | qemu-3a011c26bc74ab0fb4b5289a10fff13e46a02e8c.zip | |
migration: Remove section_id parameter from vmstate_load
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>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/savevm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/migration/savevm.c b/migration/savevm.c index d96209b3cb..2d1d4bc213 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -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)"); 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) @@ -1882,7 +1882,7 @@ qemu_loadvm_section_start_full(QEMUFile *f, MigrationIncomingState *mis) return -EINVAL; } - ret = vmstate_load(f, se, se->load_version_id); + ret = vmstate_load(f, se); if (ret < 0) { error_report("error while loading state for instance 0x%x of" " device '%s'", instance_id, idstr); @@ -1915,7 +1915,7 @@ qemu_loadvm_section_part_end(QEMUFile *f, MigrationIncomingState *mis) return -EINVAL; } - ret = vmstate_load(f, se, se->load_version_id); + ret = vmstate_load(f, se); if (ret < 0) { error_report("error while loading state section id %d(%s)", section_id, se->idstr); |