Commit e93379b0 authored by Alex Bligh's avatar Alex Bligh Committed by Stefan Hajnoczi
Browse files

aio / timers: Rename qemu_timer_* functions 



Rename four functions in preparation for new API.

Rename qemu_timer_expired to timer_expired
Rename qemu_timer_expire_time_ns to timer_expire_time_ns
Rename qemu_timer_pending to timer_pending
Rename qemu_timer_expired_ns to timer_expired_ns

Signed-off-by: default avatarAlex Bligh <alex@alex.org.uk>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 04d542c8

backends/baum.c

+3 −3
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ static int baum_eat_packet(BaumDriverState *baum, const uint8_t *buf, int len) 
            return 0; \

        if (*cur++ != ESC) { \

            DPRINTF("Broken packet %#2x, tossing\n", req); \

		if (qemu_timer_pending(baum->cellCount_timer)) { \

            if (timer_pending(baum->cellCount_timer)) {    \

                qemu_del_timer(baum->cellCount_timer);     \

                baum_cellCount_timer_cb(baum);             \

            } \

hw/input/tsc2005.c

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ static int tsc2005_load(QEMUFile *f, void *opaque, int version_id) 
    for (i = 0; i < 8; i ++)

        s->tr[i] = qemu_get_be32(f);



    s->busy = qemu_timer_pending(s->timer);

    s->busy = timer_pending(s->timer);

    tsc2005_pin_update(s);



    return 0;

hw/input/tsc210x.c

+1 −1
Original line number Diff line number Diff line
@@ -1093,7 +1093,7 @@ static int tsc210x_load(QEMUFile *f, void *opaque, int version_id) 
    for (i = 0; i < 0x14; i ++)

        qemu_get_be16s(f, &s->filter_data[i]);



    s->busy = qemu_timer_pending(s->timer);

    s->busy = timer_pending(s->timer);

    qemu_set_irq(s->pint, !s->irq);

    qemu_set_irq(s->davint, !s->dav);

hw/mips/cputimer.c

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ uint32_t cpu_mips_get_count (CPUMIPSState *env) 
        uint64_t now;



        now = qemu_get_clock_ns(vm_clock);

        if (qemu_timer_pending(env->timer)

            && qemu_timer_expired(env->timer, now)) {

        if (timer_pending(env->timer)

            && timer_expired(env->timer, now)) {

            /* The timer has already expired.  */

            cpu_mips_timer_expire(env);

        }

hw/openrisc/cputimer.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static void openrisc_timer_cb(void *opaque) 
    OpenRISCCPU *cpu = opaque;



    if ((cpu->env.ttmr & TTMR_IE) &&

         qemu_timer_expired(cpu->env.timer, qemu_get_clock_ns(vm_clock))) {

         timer_expired(cpu->env.timer, qemu_get_clock_ns(vm_clock))) {

        CPUState *cs = CPU(cpu);



        cpu->env.ttmr |= TTMR_IP;