mirror of https://github.com/proxmox/mirror_qemu
cpu: initialize cpu->exception_index on reset
This unbreaks linux-user (broken by e511b4d
, cpu-exec: reset exception_index
correctly, 2014-11-26).
Reported-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Tested-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Tested-by: Eduardo Habkost <ehabkost@redhat.com>
Message-id: 1418989994-17244-2-git-send-email-pbonzini@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
master
parent
b574f60268
commit
f9d8f66735
3
cpus.c
3
cpus.c
|
@ -940,7 +940,6 @@ static void *qemu_kvm_cpu_thread_fn(void *arg)
|
||||||
qemu_mutex_lock(&qemu_global_mutex);
|
qemu_mutex_lock(&qemu_global_mutex);
|
||||||
qemu_thread_get_self(cpu->thread);
|
qemu_thread_get_self(cpu->thread);
|
||||||
cpu->thread_id = qemu_get_thread_id();
|
cpu->thread_id = qemu_get_thread_id();
|
||||||
cpu->exception_index = -1;
|
|
||||||
cpu->can_do_io = 1;
|
cpu->can_do_io = 1;
|
||||||
current_cpu = cpu;
|
current_cpu = cpu;
|
||||||
|
|
||||||
|
@ -982,7 +981,6 @@ static void *qemu_dummy_cpu_thread_fn(void *arg)
|
||||||
qemu_mutex_lock_iothread();
|
qemu_mutex_lock_iothread();
|
||||||
qemu_thread_get_self(cpu->thread);
|
qemu_thread_get_self(cpu->thread);
|
||||||
cpu->thread_id = qemu_get_thread_id();
|
cpu->thread_id = qemu_get_thread_id();
|
||||||
cpu->exception_index = -1;
|
|
||||||
cpu->can_do_io = 1;
|
cpu->can_do_io = 1;
|
||||||
|
|
||||||
sigemptyset(&waitset);
|
sigemptyset(&waitset);
|
||||||
|
@ -1026,7 +1024,6 @@ static void *qemu_tcg_cpu_thread_fn(void *arg)
|
||||||
CPU_FOREACH(cpu) {
|
CPU_FOREACH(cpu) {
|
||||||
cpu->thread_id = qemu_get_thread_id();
|
cpu->thread_id = qemu_get_thread_id();
|
||||||
cpu->created = true;
|
cpu->created = true;
|
||||||
cpu->exception_index = -1;
|
|
||||||
cpu->can_do_io = 1;
|
cpu->can_do_io = 1;
|
||||||
}
|
}
|
||||||
qemu_cond_signal(&qemu_cpu_cond);
|
qemu_cond_signal(&qemu_cpu_cond);
|
||||||
|
|
|
@ -249,6 +249,7 @@ static void cpu_common_reset(CPUState *cpu)
|
||||||
cpu->icount_extra = 0;
|
cpu->icount_extra = 0;
|
||||||
cpu->icount_decr.u32 = 0;
|
cpu->icount_decr.u32 = 0;
|
||||||
cpu->can_do_io = 0;
|
cpu->can_do_io = 0;
|
||||||
|
cpu->exception_index = -1;
|
||||||
memset(cpu->tb_jmp_cache, 0, TB_JMP_CACHE_SIZE * sizeof(void *));
|
memset(cpu->tb_jmp_cache, 0, TB_JMP_CACHE_SIZE * sizeof(void *));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue