Patchwork remove dead code, and make cpu_exec_all() static

login
register
mail settings
Submitter Jun Koi
Date Nov. 1, 2011, 8:57 a.m.
Message ID <CA+g7VZ22BhapSvnRPdS1aiHL0t1FjGcZXBNdVRdCTdkF12-Nwg@mail.gmail.com>
Download mbox | patch
Permalink /patch/123044/
State New
Headers show

Comments

Jun Koi - Nov. 1, 2011, 8:57 a.m.
This patch removes dead code (kvm related) in cpu_exec_all(), and
makes that static (since nobody uses it)

Signed-off-by: Jun Koi <junkoi2004@gmail.com>

Patch

diff --git a/cpus.c b/cpus.c
index f768683..77282a1 100644
--- a/cpus.c
+++ b/cpus.c
@@ -85,6 +85,8 @@  typedef struct TimersState {

 TimersState timers_state;

+static bool cpu_exec_all(void);
+
 /* Return the virtual CPU time, based on the instruction counter.  */
 int64_t cpu_get_icount(void)
 {
@@ -1016,7 +1018,7 @@  static int tcg_cpu_exec(CPUState *env)
     return ret;
 }

-bool cpu_exec_all(void)
+static bool cpu_exec_all(void)
 {
     int r;

@@ -1033,12 +1035,7 @@  bool cpu_exec_all(void)
                           (env->singlestep_enabled & SSTEP_NOTIMER) == 0);

         if (cpu_can_run(env)) {
-            if (kvm_enabled()) {
-                r = kvm_cpu_exec(env);
-                qemu_kvm_eat_signals(env);
-            } else {
-                r = tcg_cpu_exec(env);
-            }
+            r = tcg_cpu_exec(env);
             if (r == EXCP_DEBUG) {
                 cpu_handle_guest_debug(env);
                 break;
diff --git a/cpus.h b/cpus.h
index 3525375..4ea2fe2 100644
--- a/cpus.h
+++ b/cpus.h
@@ -14,7 +14,6 @@  void cpu_synchronize_all_post_init(void);
 /* vl.c */
 extern int smp_cores;
 extern int smp_threads;
-bool cpu_exec_all(void);
 void set_numa_modes(void);
 void set_cpu_log(const char *optarg);
 void set_cpu_log_filename(const char *optarg);