diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2011-03-12 17:43:56 +0100 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-03-13 14:44:21 +0000 |
| commit | eda48c344f35e5bd511dea3e8be56fb08c19b399 (patch) | |
| tree | ce42c00d38ed2034cfe1d9babf758e12d4c22e1b /target-arm | |
| parent | 38a42e7c527f3d1fb745211b1fbb7b9af76f790f (diff) | |
| download | qemu-eda48c344f35e5bd511dea3e8be56fb08c19b399.zip qemu-eda48c344f35e5bd511dea3e8be56fb08c19b399.tar.gz qemu-eda48c344f35e5bd511dea3e8be56fb08c19b399.tar.bz2 | |
inline cpu_halted into sole caller
All implementations are now the same, and there is only one caller,
so inline the function there.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-arm')
| -rw-r--r-- | target-arm/exec.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/target-arm/exec.h b/target-arm/exec.h index e4c35a3..44e1b55 100644 --- a/target-arm/exec.h +++ b/target-arm/exec.h @@ -32,19 +32,6 @@ static inline int cpu_has_work(CPUState *env) (CPU_INTERRUPT_FIQ | CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB)); } -static inline int cpu_halted(CPUState *env) { - if (!env->halted) - return 0; - /* An interrupt wakes the CPU even if the I and F CPSR bits are - set. We use EXITTB to silently wake CPU without causing an - actual interrupt. */ - if (cpu_has_work(env)) { - env->halted = 0; - return 0; - } - return EXCP_HALTED; -} - #if !defined(CONFIG_USER_ONLY) #include "softmmu_exec.h" #endif |