From eda48c344f35e5bd511dea3e8be56fb08c19b399 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Sat, 12 Mar 2011 17:43:56 +0100 Subject: 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 Signed-off-by: Blue Swirl --- cpu-exec.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'cpu-exec.c') diff --git a/cpu-exec.c b/cpu-exec.c index 70c3e5ae1b..34eaedca04 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -208,8 +208,13 @@ int cpu_exec(CPUState *env1) uint8_t *tc_ptr; unsigned long next_tb; - if (cpu_halted(env1) == EXCP_HALTED) - return EXCP_HALTED; + if (env1->halted) { + if (!cpu_has_work(env1)) { + return EXCP_HALTED; + } + + env1->halted = 0; + } cpu_single_env = env1; -- cgit 1.4.1