commit 93949dc9a6f5a702db214d19080397a9e94b45f6
author David 'Digit' Turner <digit@google.com> Tue Mar 18 15:00:37 2014 +0100
committer David 'Digit' Turner <digit@google.com> Wed Apr 09 19:43:19 2014 +0200
tree d8c8049084b678521444b1437c7113db5e6504e3
parent 7f7d9a9741a5bf946a51bba2de1eb8fc3374149e

Move cpu_has_work and cpu_pc_from_tb to cpu.h

Upstream f081c76ccfdbc1fdaa90fa5eb6abad46c1b5bfa8

Change-Id: I6f871f67404e13ba0c5070370542c0166814da02

cpus.c

diff --git a/cpus.c b/cpus.c
index 089e0fe..8b00daa 100644
--- a/cpus.c
+++ b/cpus.c
@@ -26,6 +26,7 @@
 #include "cpu.h"
 #include "monitor/monitor.h"
 #include "sysemu/sysemu.h"
+#include "exec.h"
 #include "exec/exec-all.h"
 #include "exec/gdbstub.h"
 #include "sysemu/dma.h"
@@ -79,7 +80,7 @@
     return 1;
 }
 
-static int cpu_has_work(CPUOldState *env)
+static int internal_cpu_has_work(CPUOldState *env)
 {
     if (env->stop)
         return 1;
@@ -87,7 +88,7 @@
         return 0;
     if (!env->halted)
         return 1;
-    if (qemu_cpu_has_work(env))
+    if (cpu_has_work(env))
         return 1;
     return 0;
 }
@@ -97,7 +98,7 @@
     CPUOldState *env;
 
     for (env = first_cpu; env != NULL; env = env->next_cpu)
-        if (cpu_has_work(env))
+        if (internal_cpu_has_work(env))
             return 1;
     return 0;
 }