[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/15] migration: Remove section_id parameter from vm
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 03/15] migration: Remove section_id parameter from vmstate_load |
Date: |
Thu, 1 Jun 2017 21:23:15 +0200 |
Everything else assumes that we always load a device from its own
savevm handler.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
migration/savevm.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index d96209b..2d1d4bc 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);
--
2.9.4
- [Qemu-devel] [PULL 00/15] Migration PULL request, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 01/15] migration: Use savevm_handlers instead of loadvm copy, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 03/15] migration: Remove section_id parameter from vmstate_load,
Juan Quintela <=
- [Qemu-devel] [PULL 02/15] migration: loadvm handlers are not used, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 04/15] migration: fix leak of src file on dst, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 05/15] migration: shut src return path unconditionally, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 06/15] migration: Remove unneeded includes of migration/vmstate.h, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 08/15] migration: Export exec.c functions in its own file, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 07/15] migration: Split qemu-file.h, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 10/15] migration: Export socket.c functions in its own file, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 11/15] migration: Export tls.c functions in its own file, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 09/15] migration: Export fd.c functions in its own file, Juan Quintela, 2017/06/01
- [Qemu-devel] [PULL 12/15] migration: Export rdma.c functions in its own file, Juan Quintela, 2017/06/01