]> xenbits.xensource.com Git - qemu-upstream-4.5-testing.git/commitdiff
cpu: Don't clear cpu->exit_request on reset
authorEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Thu, 13 Feb 2014 05:07:14 +0000 (15:07 +1000)
committerAndreas Färber <afaerber@suse.de>
Thu, 13 Mar 2014 18:01:48 +0000 (19:01 +0100)
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>
qom/cpu.c

index 9d624795461071bca72e6ea551fc71d298f846e4..40d82dd178a1ef18272cb58fe294c14dc98a433c 100644 (file)
--- 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;