Patchwork [qom-next,15/59] cpus: Pass CPUState to cpu_is_stopped()

login
register
mail settings
Submitter Andreas Färber
Date May 23, 2012, 3:07 a.m.
Message ID <1337742502-28565-16-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/160841/
State New
Headers show

Comments

Andreas Färber - May 23, 2012, 3:07 a.m.
CPUArchState is no longer needed there.

Also change the return type to bool.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 cpu-all.h          |    1 -
 cpus.c             |    4 +---
 include/qemu/cpu.h |   11 +++++++++++
 target-i386/kvm.c  |    4 ++--
 4 files changed, 14 insertions(+), 6 deletions(-)

Patch

diff --git a/cpu-all.h b/cpu-all.h
index 3a93c0c..af85e7d 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -443,7 +443,6 @@  void cpu_watchpoint_remove_all(CPUArchState *env, int mask);
 #define SSTEP_NOTIMER 0x4  /* Do not Timers while single stepping */
 
 void cpu_single_step(CPUArchState *env, int enabled);
-int cpu_is_stopped(CPUArchState *env);
 void run_on_cpu(CPUArchState *env, void (*func)(void *data), void *data);
 
 #define CPU_LOG_TB_OUT_ASM (1 << 0)
diff --git a/cpus.c b/cpus.c
index fca4eb2..753277d 100644
--- a/cpus.c
+++ b/cpus.c
@@ -404,10 +404,8 @@  void cpu_synchronize_all_post_init(void)
     }
 }
 
-int cpu_is_stopped(CPUArchState *env)
+bool cpu_is_stopped(CPUState *cpu)
 {
-    CPUState *cpu = ENV_GET_CPU(env);
-
     return !runstate_is_running() || cpu->stopped;
 }
 
diff --git a/include/qemu/cpu.h b/include/qemu/cpu.h
index 83378c5..4e62032 100644
--- a/include/qemu/cpu.h
+++ b/include/qemu/cpu.h
@@ -94,5 +94,16 @@  void cpu_reset(CPUState *cpu);
  */
 bool qemu_cpu_is_self(CPUState *cpu);
 
+/**
+ * cpu_is_stopped:
+ * @cpu: The CPU to check.
+ *
+ * Checks whether the CPU is stopped.
+ *
+ * Returns: %true if run state is not running or if artificially stopped;
+ * %false otherwise.
+ */
+bool cpu_is_stopped(CPUState *cpu);
+
 
 #endif
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index e9e2241..92ad338 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -1530,7 +1530,7 @@  int kvm_arch_put_registers(CPUX86State *env, int level)
     CPUState *cpu = ENV_GET_CPU(env);
     int ret;
 
-    assert(cpu_is_stopped(env) || qemu_cpu_is_self(cpu));
+    assert(cpu_is_stopped(cpu) || qemu_cpu_is_self(cpu));
 
     ret = kvm_getput_regs(env, 1);
     if (ret < 0) {
@@ -1588,7 +1588,7 @@  int kvm_arch_get_registers(CPUX86State *env)
     CPUState *cpu = ENV_GET_CPU(env);
     int ret;
 
-    assert(cpu_is_stopped(env) || qemu_cpu_is_self(cpu));
+    assert(cpu_is_stopped(cpu) || qemu_cpu_is_self(cpu));
 
     ret = kvm_getput_regs(env, 0);
     if (ret < 0) {