From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHxXM-0003Hc-J6 for qemu-devel@nongnu.org; Sat, 09 Jan 2016 12:42:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHxXK-0000h3-BN for qemu-devel@nongnu.org; Sat, 09 Jan 2016 12:42:48 -0500 From: Dmitry Osipenko Date: Sat, 9 Jan 2016 20:39:52 +0300 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH v10 4/7] hw/ptimer: Support "on the fly" timer mode switch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers , qemu-arm@nongnu.org Cc: Peter Maydell , Peter Crosthwaite Allow to switch between periodic <-> oneshot modes while timer is running. Signed-off-by: Dmitry Osipenko --- hw/core/ptimer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c index 0a54212..6960738 100644 --- a/hw/core/ptimer.c +++ b/hw/core/ptimer.c @@ -167,16 +167,16 @@ void ptimer_set_count(ptimer_state *s, uint64_t count) void ptimer_run(ptimer_state *s, int oneshot) { - if (s->enabled) { - return; - } - if (s->period == 0) { + int was_disabled = !s->enabled; + if (was_disabled && s->period == 0) { fprintf(stderr, "Timer with period zero, disabling\n"); return; } s->enabled = oneshot ? 2 : 1; - s->next_event = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); - ptimer_reload(s); + if (was_disabled) { + s->next_event = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + ptimer_reload(s); + } } /* Pause a timer. Note that this may cause it to "lose" time, even if it -- 2.6.4