Some cpu's definitions define CPU_SAVE_VERSION, others not, but they have defined cpu_save/load.
Signed-off-by: Juan Quintela <quint...@redhat.com> --- exec.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index 9dc4edb..165cfe8 100644 --- a/exec.c +++ b/exec.c @@ -591,7 +591,7 @@ void cpu_exec_init_all(void) #endif } -#if defined(CPU_SAVE_VERSION) && !defined(CONFIG_USER_ONLY) +#if !defined(CONFIG_USER_ONLY) static int cpu_common_post_load(void *opaque, int version_id) { @@ -658,11 +658,13 @@ void cpu_exec_init(CPUState *env) #if defined(CONFIG_USER_ONLY) cpu_list_unlock(); #endif -#if defined(CPU_SAVE_VERSION) && !defined(CONFIG_USER_ONLY) +#if !defined(CONFIG_USER_ONLY) vmstate_register(NULL, cpu_index, &vmstate_cpu_common, env); +#if defined(CPU_SAVE_VERSION) register_savevm(NULL, "cpu", cpu_index, CPU_SAVE_VERSION, cpu_save, cpu_load, env); #endif +#endif } /* Allocate a new translation block. Flush the translation buffer if -- 1.7.6.4