aboutsummaryrefslogtreecommitdiff
path: root/util/qemu-timer.c
diff options
context:
space:
mode:
authorDr. David Alan Gilbert <dgilbert@redhat.com>2019-07-24 12:58:21 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2019-08-20 17:26:20 +0200
commit4ea9a0e3db39a3ef07f8a97c005733d127485891 (patch)
tree398679ea88d00af13b9db191a05c7784018bc618 /util/qemu-timer.c
parent8ff72af557dcae1e1d441983f9057f8c99cad26f (diff)
downloadqemu-4ea9a0e3db39a3ef07f8a97c005733d127485891.zip
qemu-4ea9a0e3db39a3ef07f8a97c005733d127485891.tar.gz
qemu-4ea9a0e3db39a3ef07f8a97c005733d127485891.tar.bz2
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>
Diffstat (limited to 'util/qemu-timer.c')
-rw-r--r--util/qemu-timer.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/util/qemu-timer.c b/util/qemu-timer.c
index b0e40a9..1ac8314 100644
--- a/util/qemu-timer.c
+++ b/util/qemu-timer.c
@@ -47,7 +47,6 @@ typedef struct QEMUClock {
/* We rely on BQL to protect the timerlists */
QLIST_HEAD(, QEMUTimerList) timerlists;
- NotifierList reset_notifiers;
int64_t last;
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->last = INT64_MIN;
QLIST_INIT(&clock->timerlists);
- notifier_list_init(&clock->reset_notifiers);
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 now, last;
+ int64_t now;
QEMUClock *clock = qemu_clock_ptr(type);
switch (type) {
@@ -644,11 +642,7 @@ int64_t qemu_clock_get_ns(QEMUClockType type)
}
case QEMU_CLOCK_HOST:
now = REPLAY_CLOCK(REPLAY_CLOCK_HOST, get_clock_realtime());
- last = clock->last;
clock->last = now;
- if (now < last || now > (last + get_max_clock_jump())) {
- notifier_list_notify(&clock->reset_notifiers, &now);
- }
return now;
case QEMU_CLOCK_VIRTUAL_RT:
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;
}
-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)
{
QEMUClockType type;