[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/18] introduce and use qemu_clock_enable
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 10/18] introduce and use qemu_clock_enable |
Date: |
Wed, 10 Mar 2010 11:38:47 +0100 |
By adding the possibility to turn on/off a clock, yet another
incestuous relationship between timers and CPUs can be disentangled.
Signed-off-by: Paolo Bonzini <address@hidden>
---
vl.c | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/vl.c b/vl.c
index 2b9b379..6cd77e6 100644
--- a/vl.c
+++ b/vl.c
@@ -578,6 +578,7 @@ void cpu_disable_ticks(void)
struct QEMUClock {
int type;
+ int enabled;
/* XXX: add frequency */
};
@@ -812,9 +813,15 @@ static QEMUClock *qemu_new_clock(int type)
QEMUClock *clock;
clock = qemu_mallocz(sizeof(QEMUClock));
clock->type = type;
+ clock->enabled = 1;
return clock;
}
+static void qemu_clock_enable(QEMUClock *clock, int enabled)
+{
+ clock->enabled = enabled;
+}
+
QEMUTimer *qemu_new_timer(QEMUClock *clock, QEMUTimerCB *cb, void *opaque)
{
QEMUTimer *ts;
@@ -907,6 +914,9 @@ static void qemu_run_timers(QEMUClock *clock)
{
QEMUTimer **ptimer_head, *ts;
int64_t current_time;
+
+ if (!clock->enabled)
+ return;
current_time = qemu_get_clock (clock);
ptimer_head = &active_timers[clock->type];
@@ -1017,8 +1027,7 @@ static void qemu_run_all_timers(void)
/* vm time timers */
if (vm_running) {
- if (!cur_cpu || likely(!(cur_cpu->singlestep_enabled & SSTEP_NOTIMER)))
- qemu_run_timers(vm_clock);
+ qemu_run_timers(vm_clock);
}
qemu_run_timers(rt_clock);
@@ -3970,6 +3979,9 @@ static void tcg_cpu_exec(void)
for (; next_cpu != NULL; next_cpu = next_cpu->next_cpu) {
CPUState *env = cur_cpu = next_cpu;
+ qemu_clock_enable(vm_clock,
+ (cur_cpu->singlestep_enabled & SSTEP_NOTIMER) == 0);
+
if (alarm_timer->pending)
break;
if (cpu_can_run(env))
--
1.6.6
- [Qemu-devel] [PATCH 00/18] extract qemu-timer.c, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 01/18] avoid dubiously clever code in win32_start_timer, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 02/18] fix error in win32_rearm_timer, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 03/18] only one flag is needed for alarm_timer, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 04/18] more alarm timer cleanup, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 05/18] do not use qemu_event_increment outside qemu_notify_event, Paolo Bonzini, 2010/03/10
- [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 <=
- [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, 2010/03/10
- [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