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

timer: Remove reset notifiers 

Remove the reset notifer from the core qemu-timer code.
The only user was mc146818 and we've just remove it's use.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190724115823.4199-3-dgilbert@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2019-07-24 12:58:21 +01:00 committed by Paolo Bonzini
parent 8ff72af557
commit 4ea9a0e3db
2 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/qemu/timer.h
View File

@ -227,28 +227,6 @@ void qemu_clock_enable(QEMUClockType type, bool enabled);
*/ */
void qemu_start_warp_timer(void); void qemu_start_warp_timer(void);
/**
* qemu_clock_register_reset_notifier:
* @type: the clock type
* @notifier: the notifier function
*
* Register a notifier function to call when the clock
* concerned is reset.
*/
void qemu_clock_register_reset_notifier(QEMUClockType type,
Notifier *notifier);
/**
* qemu_clock_unregister_reset_notifier:
* @type: the clock type
* @notifier: the notifier function
*
* Unregister a notifier function to call when the clock
* concerned is reset.
*/
void qemu_clock_unregister_reset_notifier(QEMUClockType type,
Notifier *notifier);
/** /**
* qemu_clock_run_timers: * qemu_clock_run_timers:
* @type: clock on which to operate * @type: clock on which to operate

21
util/qemu-timer.c
View File

@ -47,7 +47,6 @@ typedef struct QEMUClock {
/* We rely on BQL to protect the timerlists */ /* We rely on BQL to protect the timerlists */
QLIST_HEAD(, QEMUTimerList) timerlists; QLIST_HEAD(, QEMUTimerList) timerlists;
NotifierList reset_notifiers;
int64_t last; int64_t last;
QEMUClockType type; QEMUClockType type;
@ -132,7 +131,6 @@ static void qemu_clock_init(QEMUClockType type, QEMUTimerListNotifyCB *notify_cb
clock->enabled = (type == QEMU_CLOCK_VIRTUAL ? false : true); clock->enabled = (type == QEMU_CLOCK_VIRTUAL ? false : true);
clock->last = INT64_MIN; clock->last = INT64_MIN;
QLIST_INIT(&clock->timerlists); QLIST_INIT(&clock->timerlists);
notifier_list_init(&clock->reset_notifiers);
main_loop_tlg.tl[type] = timerlist_new(type, notify_cb, NULL); main_loop_tlg.tl[type] = timerlist_new(type, notify_cb, NULL);
} }
@ -629,7 +627,7 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup *tlg)
int64_t qemu_clock_get_ns(QEMUClockType type) int64_t qemu_clock_get_ns(QEMUClockType type)
{ {
int64_t now, last; int64_t now;
QEMUClock *clock = qemu_clock_ptr(type); QEMUClock *clock = qemu_clock_ptr(type);
switch (type) { switch (type) {
@ -644,11 +642,7 @@ int64_t qemu_clock_get_ns(QEMUClockType type)
} }
case QEMU_CLOCK_HOST: case QEMU_CLOCK_HOST:
now = REPLAY_CLOCK(REPLAY_CLOCK_HOST, get_clock_realtime()); now = REPLAY_CLOCK(REPLAY_CLOCK_HOST, get_clock_realtime());
last = clock->last;
clock->last = now; clock->last = now;
if (now < last || now > (last + get_max_clock_jump())) {
notifier_list_notify(&clock->reset_notifiers, &now);
}
return now; return now;
case QEMU_CLOCK_VIRTUAL_RT: case QEMU_CLOCK_VIRTUAL_RT:
return REPLAY_CLOCK(REPLAY_CLOCK_VIRTUAL_RT, cpu_get_clock()); return REPLAY_CLOCK(REPLAY_CLOCK_VIRTUAL_RT, cpu_get_clock());
@ -667,19 +661,6 @@ void qemu_clock_set_last(QEMUClockType type, uint64_t last)
clock->last = last; clock->last = last;
} }
void qemu_clock_register_reset_notifier(QEMUClockType type,
Notifier *notifier)
{
QEMUClock *clock = qemu_clock_ptr(type);
notifier_list_add(&clock->reset_notifiers, notifier);
}
void qemu_clock_unregister_reset_notifier(QEMUClockType type,
Notifier *notifier)
{
notifier_remove(notifier);
}
void init_clocks(QEMUTimerListNotifyCB *notify_cb) void init_clocks(QEMUTimerListNotifyCB *notify_cb)
{ {
QEMUClockType type; QEMUClockType type;