From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zm94L-0006v8-Dp for qemu-devel@nongnu.org; Tue, 13 Oct 2015 19:33:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zm94I-0003eD-7X for qemu-devel@nongnu.org; Tue, 13 Oct 2015 19:33:21 -0400 Received: from mail-lf0-x22e.google.com ([2a00:1450:4010:c07::22e]:33266) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zm94I-0003dg-0E for qemu-devel@nongnu.org; Tue, 13 Oct 2015 19:33:18 -0400 Received: by lffv3 with SMTP id v3so3689465lff.0 for ; Tue, 13 Oct 2015 16:33:17 -0700 (PDT) From: Dmitry Osipenko Date: Wed, 14 Oct 2015 02:30:47 +0300 Message-Id: <1444779048-10096-1-git-send-email-digetx@gmail.com> Subject: [Qemu-devel] [PATCH v5 1/2] hw/ptimer: Set delta to the original limit on reload in ptimer_set_limit() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Crosthwaite , Peter Maydell Cc: QEMU Developers ptimer_get_count() returns incorrect value for the disabled timer after reloading the counter with a small value, because corrected limit value is used instead of the original. For instance: 1) ptimer_stop(t) 2) ptimer_set_period(t, 1) 3) ptimer_set_limit(t, 0, 1) 4) ptimer_get_count(t) <-- would return 10000 instead of 0 Signed-off-by: Dmitry Osipenko --- hw/core/ptimer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c index 8437bd6..abc3a20 100644 --- a/hw/core/ptimer.c +++ b/hw/core/ptimer.c @@ -180,6 +180,8 @@ void ptimer_set_freq(ptimer_state *s, uint32_t freq) count = limit. */ void ptimer_set_limit(ptimer_state *s, uint64_t limit, int reload) { + uint64_t count = limit; + /* * Artificially limit timeout rate to something * achievable under QEMU. Otherwise, QEMU spends all @@ -195,7 +197,7 @@ void ptimer_set_limit(ptimer_state *s, uint64_t limit, int reload) s->limit = limit; if (reload) - s->delta = limit; + s->delta = count; if (s->enabled && reload) { s->next_event = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); ptimer_reload(s); -- 2.6.0