[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/3] migration: Remove section_id parameter from vms
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 3/3] migration: Remove section_id parameter from vmstate_load |
Date: |
Wed, 24 May 2017 10:55:19 +0200 |
From: Juan Quintela <address@hidden>
Everything else assumes that we always load a device from its own
savevm handler.
Signed-off-by: Juan Quintela <address@hidden>
---
migration/savevm.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index 96b7173..e847a6b 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -721,13 +721,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->version_id);
}
- return vmstate_load_state(f, se->vmsd, se->opaque, version_id);
+ return vmstate_load_state(f, se->vmsd, se->opaque, se->version_id);
}
static void vmstate_save_old_style(QEMUFile *f, SaveStateEntry *se, QJSON
*vmdesc)
@@ -1855,7 +1855,7 @@ qemu_loadvm_section_start_full(QEMUFile *f,
MigrationIncomingState *mis)
return -EINVAL;
}
- ret = vmstate_load(f, se, se->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);
@@ -1888,7 +1888,7 @@ qemu_loadvm_section_part_end(QEMUFile *f,
MigrationIncomingState *mis)
return -EINVAL;
}
- ret = vmstate_load(f, se, se->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.3