diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-05-12 08:08:12 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-05-12 08:08:12 -0500 |
| commit | 230ee10ada1d86ce3ccf5458cffbc58814174a47 (patch) | |
| tree | 9f5385c53ac50e613ae34d4165d02460ef993f0f /cpu-exec.c | |
| parent | d946412a1efa1c23a645094720525dcc4308eefd (diff) | |
| parent | 7de51eb96d17aa422c0e3038795d8affdb4d5505 (diff) | |
| download | qemu-230ee10ada1d86ce3ccf5458cffbc58814174a47.tar.gz qemu-230ee10ada1d86ce3ccf5458cffbc58814174a47.tar.bz2 qemu-230ee10ada1d86ce3ccf5458cffbc58814174a47.zip | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Conflicts:
cpu-all.h
Diffstat (limited to 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 6d4372661c..7323f3c260 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -503,7 +503,7 @@ int cpu_exec(CPUState *env1) jump normally, then does the exception return when the CPU tries to execute code at the magic address. This will cause the magic PC value to be pushed to - the stack if an interrupt occured at the wrong time. + the stack if an interrupt occurred at the wrong time. We avoid this by disabling interrupts when pc contains a magic address. */ if (interrupt_request & CPU_INTERRUPT_HARD @@ -563,7 +563,7 @@ int cpu_exec(CPUState *env1) next_tb = 0; } #endif - /* Don't use the cached interupt_request value, + /* Don't use the cached interrupt_request value, do_interrupt may have updated the EXITTB flag. */ if (env->interrupt_request & CPU_INTERRUPT_EXITTB) { env->interrupt_request &= ~CPU_INTERRUPT_EXITTB; |