ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename QEMU_TIMER_* to QEMU_CLOCK_* 

These constants select clocks, not timers. And init_timers initializes
clocks.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Jan Kiszka 2009-09-15 13:36:04 +02:00 committed by Anthony Liguori
parent 0148fde54c
commit 0fdddf80a8
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
vl.c
View File

@ -676,8 +676,8 @@ void cpu_disable_ticks(void)
/***********************************************************/ /***********************************************************/
/* timers */ /* timers */
#define QEMU_TIMER_REALTIME 0 #define QEMU_CLOCK_REALTIME 0
#define QEMU_TIMER_VIRTUAL 1 #define QEMU_CLOCK_VIRTUAL 1
struct QEMUClock { struct QEMUClock {
int type; int type;
@ -1025,10 +1025,10 @@ static void qemu_run_timers(QEMUTimer **ptimer_head, int64_t current_time)
int64_t qemu_get_clock(QEMUClock *clock) int64_t qemu_get_clock(QEMUClock *clock)
{ {
switch(clock->type) { switch(clock->type) {
case QEMU_TIMER_REALTIME: case QEMU_CLOCK_REALTIME:
return get_clock() / 1000000; return get_clock() / 1000000;
default: default:
case QEMU_TIMER_VIRTUAL: case QEMU_CLOCK_VIRTUAL:
if (use_icount) { if (use_icount) {
return cpu_get_icount(); return cpu_get_icount();
} else { } else {
@ -1037,11 +1037,11 @@ int64_t qemu_get_clock(QEMUClock *clock)
} }
} }
static void init_timers(void) static void init_clocks(void)
{ {
init_get_clock(); init_get_clock();
rt_clock = qemu_new_clock(QEMU_TIMER_REALTIME); rt_clock = qemu_new_clock(QEMU_CLOCK_REALTIME);
vm_clock = qemu_new_clock(QEMU_TIMER_VIRTUAL); vm_clock = qemu_new_clock(QEMU_CLOCK_VIRTUAL);
} }
/* save a timer */ /* save a timer */
@ -1123,9 +1123,9 @@ static void host_alarm_handler(int host_signum)
#endif #endif
if (alarm_has_dynticks(alarm_timer) || if (alarm_has_dynticks(alarm_timer) ||
(!use_icount && (!use_icount &&
qemu_timer_expired(active_timers[QEMU_TIMER_VIRTUAL], qemu_timer_expired(active_timers[QEMU_CLOCK_VIRTUAL],
qemu_get_clock(vm_clock))) || qemu_get_clock(vm_clock))) ||
qemu_timer_expired(active_timers[QEMU_TIMER_REALTIME], qemu_timer_expired(active_timers[QEMU_CLOCK_REALTIME],
qemu_get_clock(rt_clock))) { qemu_get_clock(rt_clock))) {
qemu_event_increment(); qemu_event_increment();
if (alarm_timer) alarm_timer->flags |= ALARM_FLAG_EXPIRED; if (alarm_timer) alarm_timer->flags |= ALARM_FLAG_EXPIRED;
@ -1145,8 +1145,8 @@ static int64_t qemu_next_deadline(void)
{ {
int64_t delta; int64_t delta;
if (active_timers[QEMU_TIMER_VIRTUAL]) { if (active_timers[QEMU_CLOCK_VIRTUAL]) {
delta = active_timers[QEMU_TIMER_VIRTUAL]->expire_time - delta = active_timers[QEMU_CLOCK_VIRTUAL]->expire_time -
qemu_get_clock(vm_clock); qemu_get_clock(vm_clock);
} else { } else {
/* To avoid problems with overflow limit this to 2^32. */ /* To avoid problems with overflow limit this to 2^32. */
@ -1170,8 +1170,8 @@ static uint64_t qemu_next_deadline_dyntick(void)
else else
delta = (qemu_next_deadline() + 999) / 1000; delta = (qemu_next_deadline() + 999) / 1000;
if (active_timers[QEMU_TIMER_REALTIME]) { if (active_timers[QEMU_CLOCK_REALTIME]) {
rtdelta = (active_timers[QEMU_TIMER_REALTIME]->expire_time - rtdelta = (active_timers[QEMU_CLOCK_REALTIME]->expire_time -
qemu_get_clock(rt_clock))*1000; qemu_get_clock(rt_clock))*1000;
if (rtdelta < delta) if (rtdelta < delta)
delta = rtdelta; delta = rtdelta;
@ -1353,8 +1353,8 @@ static void dynticks_rearm_timer(struct qemu_alarm_timer *t)
int64_t nearest_delta_us = INT64_MAX; int64_t nearest_delta_us = INT64_MAX;
int64_t current_us; int64_t current_us;
if (!active_timers[QEMU_TIMER_REALTIME] && if (!active_timers[QEMU_CLOCK_REALTIME] &&
!active_timers[QEMU_TIMER_VIRTUAL]) !active_timers[QEMU_CLOCK_VIRTUAL])
return; return;
nearest_delta_us = qemu_next_deadline_dyntick(); nearest_delta_us = qemu_next_deadline_dyntick();
@ -1470,8 +1470,8 @@ static void win32_rearm_timer(struct qemu_alarm_timer *t)
struct qemu_alarm_win32 *data = t->priv; struct qemu_alarm_win32 *data = t->priv;
uint64_t nearest_delta_us; uint64_t nearest_delta_us;
if (!active_timers[QEMU_TIMER_REALTIME] && if (!active_timers[QEMU_CLOCK_REALTIME] &&
!active_timers[QEMU_TIMER_VIRTUAL]) !active_timers[QEMU_CLOCK_VIRTUAL])
return; return;
nearest_delta_us = qemu_next_deadline_dyntick(); nearest_delta_us = qemu_next_deadline_dyntick();
@ -3912,12 +3912,12 @@ void main_loop_wait(int timeout)
/* vm time timers */ /* vm time timers */
if (vm_running) { if (vm_running) {
if (!cur_cpu || likely(!(cur_cpu->singlestep_enabled & SSTEP_NOTIMER))) if (!cur_cpu || likely(!(cur_cpu->singlestep_enabled & SSTEP_NOTIMER)))
qemu_run_timers(&active_timers[QEMU_TIMER_VIRTUAL], qemu_run_timers(&active_timers[QEMU_CLOCK_VIRTUAL],
qemu_get_clock(vm_clock)); qemu_get_clock(vm_clock));
} }
/* real time timers */ /* real time timers */
qemu_run_timers(&active_timers[QEMU_TIMER_REALTIME], qemu_run_timers(&active_timers[QEMU_CLOCK_REALTIME],
qemu_get_clock(rt_clock)); qemu_get_clock(rt_clock));
/* Check bottom-halves last in case any of the earlier events triggered /* Check bottom-halves last in case any of the earlier events triggered
@ -5558,7 +5558,7 @@ int main(int argc, char **argv, char **envp)
setvbuf(stdout, NULL, _IOLBF, 0); setvbuf(stdout, NULL, _IOLBF, 0);
#endif #endif
init_timers(); init_clocks();
if (init_timer_alarm() < 0) { if (init_timer_alarm() < 0) {
fprintf(stderr, "could not initialize alarm timer\n"); fprintf(stderr, "could not initialize alarm timer\n");
exit(1); exit(1);