Upstream-Status: Backport commit 13a16f1d91fc7a46b65b22a33f6ffea1b826a097 in git://git.qemu.org/qemu.git master From 13a16f1d91fc7a46b65b22a33f6ffea1b826a097 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 16 Feb 2012 09:56:10 +0000 Subject: [PATCH] hw/pl031: Actually raise interrupt on timer expiry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix a typo in pl031_interrupt() which meant we were setting a bit in the interrupt mask rather than the interrupt status register and thus not actually raising an interrupt. This fix allows the rtctest program from the kernel's Documentation/rtc.txt to pass rather than hanging. Reported-by: Daniel Forsgren Signed-off-by: Peter Maydell Acked-by: Andreas Färber --- hw/pl031.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pl031.c b/hw/pl031.c index 05b5b11..69abc4f 100644 --- a/hw/pl031.c +++ b/hw/pl031.c @@ -76,7 +76,7 @@ static void pl031_interrupt(void * opaque) { pl031_state *s = (pl031_state *)opaque; - s->im = 1; + s->is = 1; DPRINTF("Alarm raised\n"); pl031_update(s); } -- 1.7.4.1