aboutsummaryrefslogtreecommitdiffstats
path: root/vl.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2010-03-10 11:38:53 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2010-03-17 11:14:54 -0500
commit16b151c3935b0855827de5ff19e0b636b65b4281 (patch)
tree00963e44b41cd15a67602db1d307dd7e50a07c6b /vl.c
parent1b48824fa011397e4ba541d0a5887c214047653b (diff)
place together more #ifdef CONFIG_IOTHREAD blocks
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c78
1 files changed, 37 insertions, 41 deletions
diff --git a/vl.c b/vl.c
index 86cad9896..dc6ee1816 100644
--- a/vl.c
+++ b/vl.c
@@ -3281,13 +3281,39 @@ void qemu_system_powerdown_request(void)
qemu_notify_event();
}
-#ifdef CONFIG_IOTHREAD
-static void qemu_system_vmstop_request(int reason)
+static int cpu_can_run(CPUState *env)
{
- vmstop_requested = reason;
- qemu_notify_event();
+ if (env->stop)
+ return 0;
+ if (env->stopped)
+ return 0;
+ if (!vm_running)
+ return 0;
+ return 1;
+}
+
+static int cpu_has_work(CPUState *env)
+{
+ if (env->stop)
+ return 1;
+ if (env->stopped)
+ return 0;
+ if (!env->halted)
+ return 1;
+ if (qemu_cpu_has_work(env))
+ return 1;
+ return 0;
+}
+
+static int tcg_has_work(void)
+{
+ CPUState *env;
+
+ for (env = first_cpu; env != NULL; env = env->next_cpu)
+ if (cpu_has_work(env))
+ return 1;
+ return 0;
}
-#endif
#ifndef _WIN32
static int io_thread_fd = -1;
@@ -3381,17 +3407,6 @@ static void qemu_event_increment(void)
}
#endif
-static int cpu_can_run(CPUState *env)
-{
- if (env->stop)
- return 0;
- if (env->stopped)
- return 0;
- if (!vm_running)
- return 0;
- return 1;
-}
-
#ifndef CONFIG_IOTHREAD
static int qemu_init_main_loop(void)
{
@@ -3470,8 +3485,6 @@ static QemuCond qemu_pause_cond;
static void tcg_block_io_signals(void);
static void kvm_block_io_signals(CPUState *env);
static void unblock_io_signals(void);
-static int tcg_has_work(void);
-static int cpu_has_work(CPUState *env);
static int qemu_init_main_loop(void)
{
@@ -3822,6 +3835,12 @@ void qemu_notify_event(void)
qemu_event_increment();
}
+static void qemu_system_vmstop_request(int reason)
+{
+ vmstop_requested = reason;
+ qemu_notify_event();
+}
+
void vm_stop(int reason)
{
QemuThread me;
@@ -4036,29 +4055,6 @@ static void tcg_cpu_exec(void)
}
}
-static int cpu_has_work(CPUState *env)
-{
- if (env->stop)
- return 1;
- if (env->stopped)
- return 0;
- if (!env->halted)
- return 1;
- if (qemu_cpu_has_work(env))
- return 1;
- return 0;
-}
-
-static int tcg_has_work(void)
-{
- CPUState *env;
-
- for (env = first_cpu; env != NULL; env = env->next_cpu)
- if (cpu_has_work(env))
- return 1;
- return 0;
-}
-
static int qemu_calculate_timeout(void)
{
#ifndef CONFIG_IOTHREAD