summaryrefslogtreecommitdiff
path: root/target-i386
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2011-03-12 17:43:56 +0100
committerBlue Swirl <blauwirbel@gmail.com>2011-03-13 14:44:21 +0000
commiteda48c344f35e5bd511dea3e8be56fb08c19b399 (patch)
treece42c00d38ed2034cfe1d9babf758e12d4c22e1b /target-i386
parent38a42e7c527f3d1fb745211b1fbb7b9af76f790f (diff)
downloadqemu-eda48c344f35e5bd511dea3e8be56fb08c19b399.zip
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-i386')
-rw-r--r--target-i386/exec.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/target-i386/exec.h b/target-i386/exec.h
index fc8945b964..3e7386e91c 100644
--- a/target-i386/exec.h
+++ b/target-i386/exec.h
@@ -304,18 +304,6 @@ static inline int cpu_has_work(CPUState *env)
return work;
}
-static inline int cpu_halted(CPUState *env) {
- /* handle exit of HALTED state */
- if (!env->halted)
- return 0;
- /* disable halt condition */
- if (cpu_has_work(env)) {
- env->halted = 0;
- return 0;
- }
- return EXCP_HALTED;
-}
-
/* load efer and update the corresponding hflags. XXX: do consistency
checks with cpuid bits ? */
static inline void cpu_load_efer(CPUState *env, uint64_t val)