All of our target CPUs have now been converted from the old-style
save/load function migration to use VMState structures instead.
We can therefore drop the support for the old cpu_save/cpu_load
functions from the core code.
Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
---
exec.c | 6 ------
include/qemu-common.h | 6 ------
2 files changed, 12 deletions(-)
diff --git a/exec.c b/exec.c
index 7115403..8daa915 100644
--- a/exec.c
+++ b/exec.c
@@ -662,12 +662,6 @@ void cpu_exec_init(CPUState *cpu, Error **errp)
if (qdev_get_vmsd(DEVICE(cpu)) == NULL) {
vmstate_register(NULL, cpu_index, &vmstate_cpu_common, cpu);
}
-#if defined(CPU_SAVE_VERSION) && !defined(CONFIG_USER_ONLY)
- register_savevm(NULL, "cpu", cpu_index, CPU_SAVE_VERSION,
- cpu_save, cpu_load, cpu->env_ptr);
- assert(cc->vmsd == NULL);
- assert(qdev_get_vmsd(DEVICE(cpu)) == NULL);
-#endif
if (cc->vmsd != NULL) {
vmstate_register(NULL, cpu_index, cc->vmsd, cpu);
}
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 22b010c..f557be7 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -330,12 +330,6 @@ bool tcg_enabled(void);
void cpu_exec_init_all(void);
-/* CPU save/load. */
-#ifdef CPU_SAVE_VERSION
-void cpu_save(QEMUFile *f, void *opaque);
-int cpu_load(QEMUFile *f, void *opaque, int version_id);
-#endif
-
/* Unblock cpu */
void qemu_cpu_kick_self(void);
--
1.9.1
