aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdgar E. Iglesias <edgar.iglesias@xilinx.com>2014-02-13 15:07:14 +1000
committerAndreas Färber <afaerber@suse.de>2014-03-13 19:01:48 +0100
commit9d111183d5d67be6252dd4a4e688ef4ad323f817 (patch)
tree769c8a6895cee6c5d95e089d590c442316e9e250
parent57fac92c2d4487d5c45e1ca96df6790f96c9e64c (diff)
cpu: Don't clear cpu->exit_request on reset
cpu->exit_request is part of the execution environment and should not be cleared when a CPU resets. Otherwise, we might deadlock QEMU if a CPU resets while there is I/O going on. Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--qom/cpu.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/qom/cpu.c b/qom/cpu.c
index 9d62479546..40d82dd178 100644
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -195,7 +195,6 @@ static void cpu_common_reset(CPUState *cpu)
log_cpu_state(cpu, cc->reset_dump_flags);
}
- cpu->exit_request = 0;
cpu->interrupt_request = 0;
cpu->current_tb = NULL;
cpu->halted = 0;