Commit f9d8f667 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Peter Maydell
Browse files

cpu: initialize cpu->exception_index on reset 



This unbreaks linux-user (broken by e511b4d7, cpu-exec: reset exception_index
correctly, 2014-11-26).

Reported-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Tested-by: default avatarLaurent Desnogues <laurent.desnogues@gmail.com>
Tested-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-id: 1418989994-17244-2-git-send-email-pbonzini@redhat.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent b574f602

cpus.c

+0 −3
Original line number Diff line number Diff line
@@ -940,7 +940,6 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) 
    qemu_mutex_lock(&qemu_global_mutex);

    qemu_thread_get_self(cpu->thread);

    cpu->thread_id = qemu_get_thread_id();

    cpu->exception_index = -1;

    cpu->can_do_io = 1;

    current_cpu = cpu;
@@ -982,7 +981,6 @@ static void *qemu_dummy_cpu_thread_fn(void *arg) 
    qemu_mutex_lock_iothread();

    qemu_thread_get_self(cpu->thread);

    cpu->thread_id = qemu_get_thread_id();

    cpu->exception_index = -1;

    cpu->can_do_io = 1;



    sigemptyset(&waitset);
@@ -1026,7 +1024,6 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) 
    CPU_FOREACH(cpu) {

        cpu->thread_id = qemu_get_thread_id();

        cpu->created = true;

        cpu->exception_index = -1;

        cpu->can_do_io = 1;

    }

    qemu_cond_signal(&qemu_cpu_cond);

qom/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ static void cpu_common_reset(CPUState *cpu) 
    cpu->icount_extra = 0;

    cpu->icount_decr.u32 = 0;

    cpu->can_do_io = 0;

    cpu->exception_index = -1;

    memset(cpu->tb_jmp_cache, 0, TB_JMP_CACHE_SIZE * sizeof(void *));

}