From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAPOH-0005ba-9t for qemu-devel@nongnu.org; Wed, 01 Jul 2015 17:17:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAPOD-0002ZR-6h for qemu-devel@nongnu.org; Wed, 01 Jul 2015 17:17:57 -0400 Received: from mail-lb0-x22c.google.com ([2a00:1450:4010:c04::22c]:33944) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAPOC-0002XJ-Uo for qemu-devel@nongnu.org; Wed, 01 Jul 2015 17:17:53 -0400 Received: by lbnk3 with SMTP id k3so20624057lbn.1 for ; Wed, 01 Jul 2015 14:17:50 -0700 (PDT) From: Dmitry Osipenko Date: Thu, 2 Jul 2015 00:15:19 +0300 Message-Id: <1435785330-7384-1-git-send-email-digetx@gmail.com> Subject: [Qemu-devel] [PATCH] arm_mptimer: Fix timer shutdown List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , Peter Maydell Cc: Dmitry Osipenko , qemu-devel@nongnu.org Timer, running in periodic mode, can't be stopped or coming one-shot tick won't be canceled because timer control code just doesn't handle timer disabling. Fix it by checking enable bit and deleting timer if bit isn't set. Signed-off-by: Dmitry Osipenko --- hw/timer/arm_mptimer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index 8b93b3c..917a10f 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -127,6 +127,9 @@ static void timerblock_write(void *opaque, hwaddr addr, tb->count = tb->load; } timerblock_reload(tb, 1); + } else if (!(value & 1)) { + /* Shutdown timer. */ + timer_del(tb->timer); } break; case 12: /* Interrupt status. */ -- 2.4.4