[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/18] place together more #ifdef CONFIG_IOTHREAD bl
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 16/18] place together more #ifdef CONFIG_IOTHREAD blocks |
Date: |
Wed, 10 Mar 2010 11:38:53 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
vl.c | 78 +++++++++++++++++++++++++++++++----------------------------------
1 files changed, 37 insertions(+), 41 deletions(-)
diff --git a/vl.c b/vl.c
index 3d8f089..d97da4d 100644
--- a/vl.c
+++ b/vl.c
@@ -3282,13 +3282,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;
@@ -3382,17 +3408,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)
{
@@ -3471,8 +3486,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)
{
@@ -3823,6 +3836,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;
@@ -4037,29 +4056,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
--
1.6.6
- [Qemu-devel] [PATCH 07/18] remove qemu_rearm_alarm_timer from main loop, (continued)
- [Qemu-devel] [PATCH 07/18] remove qemu_rearm_alarm_timer from main loop, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 08/18] extract timer handling out of main_loop_wait, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 06/18] tweak qemu_notify_event, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 10/18] introduce and use qemu_clock_enable, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 11/18] centralize handling of -icount, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 09/18] change qemu_run_timers interface, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 13/18] add qemu_alarm_pending, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 12/18] add qemu_icount_round, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 14/18] new function qemu_icount_delta, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 15/18] move vmstate registration of vmstate_timers earlier, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 16/18] place together more #ifdef CONFIG_IOTHREAD blocks,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 17/18] disentangle tcg and deadline calculation, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 18/18] split out qemu-timer.c, Paolo Bonzini, 2010/03/10