Commit 3c2d4c8a authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Paolo Bonzini
Browse files

timer: last, remove last bits of last 



The reset notifiers kept a 'last' counter to notice jumps;
now that we've remove the notifier we don't need to keep 'last'.

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190724115823.4199-5-dgilbert@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a02fe2ca

include/qemu/timer.h

+0 −13
Original line number Diff line number Diff line
@@ -248,19 +248,6 @@ bool qemu_clock_run_timers(QEMUClockType type); 
 */

bool qemu_clock_run_all_timers(void);



/**

 * qemu_clock_get_last:

 *

 * Returns last clock query time.

 */

uint64_t qemu_clock_get_last(QEMUClockType type);

/**

 * qemu_clock_set_last:

 *

 * Sets last clock query time.

 */

void qemu_clock_set_last(QEMUClockType type, uint64_t last);





/*

 * QEMUTimerList

util/qemu-timer.c

+1 −21
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ typedef struct QEMUClock { 
    /* We rely on BQL to protect the timerlists */

    QLIST_HEAD(, QEMUTimerList) timerlists;



    int64_t last;



    QEMUClockType type;

    bool enabled;

} QEMUClock;
@@ -129,7 +127,6 @@ static void qemu_clock_init(QEMUClockType type, QEMUTimerListNotifyCB *notify_cb 


    clock->type = type;

    clock->enabled = (type == QEMU_CLOCK_VIRTUAL ? false : true);

    clock->last = INT64_MIN;

    QLIST_INIT(&clock->timerlists);

    main_loop_tlg.tl[type] = timerlist_new(type, notify_cb, NULL);

}
@@ -627,9 +624,6 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup *tlg) 


int64_t qemu_clock_get_ns(QEMUClockType type)

{

    int64_t now;

    QEMUClock *clock = qemu_clock_ptr(type);



    switch (type) {

    case QEMU_CLOCK_REALTIME:

        return get_clock();
@@ -641,26 +635,12 @@ int64_t qemu_clock_get_ns(QEMUClockType type) 
            return cpu_get_clock();

        }

    case QEMU_CLOCK_HOST:

        now = REPLAY_CLOCK(REPLAY_CLOCK_HOST, get_clock_realtime());

        clock->last = now;

        return now;

        return REPLAY_CLOCK(REPLAY_CLOCK_HOST, get_clock_realtime());

    case QEMU_CLOCK_VIRTUAL_RT:

        return REPLAY_CLOCK(REPLAY_CLOCK_VIRTUAL_RT, cpu_get_clock());

    }

}



uint64_t qemu_clock_get_last(QEMUClockType type)

{

    QEMUClock *clock = qemu_clock_ptr(type);

    return clock->last;

}



void qemu_clock_set_last(QEMUClockType type, uint64_t last)

{

    QEMUClock *clock = qemu_clock_ptr(type);

    clock->last = last;

}



void init_clocks(QEMUTimerListNotifyCB *notify_cb)

{

    QEMUClockType type;