Commit e0d47944 authored by Andreas Färber's avatar Andreas Färber
Browse files

cpu: Fix VMSTATE_CPU() semantics 



Commit 1a1562f5 prepared a VMSTATE_CPU()
macro for device-style VMStateDescription registration, but missed to
adapt cpu_exec_init(), so that the "cpu_common" VMStateDescription was
still registered for AlphaCPU (fe31e737)
and OpenRISCCPU (da697214). Fix this.

Cc: Richard Henderson <rth@twiddle.net>
Tested-by: default avatarJia Liu <proljc@gmail.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 1197cbb9

exec.c

+4 −1
Original line number Diff line number Diff line
@@ -402,11 +402,14 @@ void cpu_exec_init(CPUArchState *env) 
#if defined(CONFIG_USER_ONLY)

    cpu_list_unlock();

#endif

    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, env);

    assert(cc->vmsd == NULL);

    assert(qdev_get_vmsd(DEVICE(cpu)) == NULL);

#endif

    if (cc->vmsd != NULL) {

        vmstate_register(NULL, cpu_index, cc->vmsd, cpu);