From bdac1c1e958c3b0bb1d02e8fb8cc141306eea103 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 20 Apr 2012 15:38:52 +0000 Subject: [PATCH] hw/arm_mptimer: Reset the qemu_timer at reset On reset of the mpcore timer/watchdog block we need to delete the qemu_timer in case it was running. Signed-off-by: Peter Maydell --- hw/arm_mptimer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/arm_mptimer.c b/hw/arm_mptimer.c index df7fb4c9bd..fe43cbb5f1 100644 --- a/hw/arm_mptimer.c +++ b/hw/arm_mptimer.c @@ -228,6 +228,9 @@ static void timerblock_reset(timerblock *tb) tb->control = 0; tb->status = 0; tb->tick = 0; + if (tb->timer) { + qemu_del_timer(tb->timer); + } } static void arm_mptimer_reset(DeviceState *dev) -- 2.30.2