From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDZEm-0002Em-NA for qemu-devel@nongnu.org; Fri, 30 Mar 2012 06:39:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SDZEk-0006vm-Gm for qemu-devel@nongnu.org; Fri, 30 Mar 2012 06:39:20 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:57030) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDZEk-0006vN-89 for qemu-devel@nongnu.org; Fri, 30 Mar 2012 06:39:18 -0400 From: Peter Maydell Date: Fri, 30 Mar 2012 11:39:10 +0100 Message-Id: <1333103953-3430-3-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1333103953-3430-1-git-send-email-peter.maydell@linaro.org> References: <1333103953-3430-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 2/5] omap: switch omap_lpg to vm_clock List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org, Paul Brook From: Paolo Bonzini The output of the pulse generator needs to be deterministic when running in -icount mode, and to remain constant whenever the VM is stopped. So the right clock to use is vm_clock. Signed-off-by: Paolo Bonzini Signed-off-by: Peter Maydell --- hw/omap1.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/omap1.c b/hw/omap1.c index 2a341bf..39e731a 100644 --- a/hw/omap1.c +++ b/hw/omap1.c @@ -3497,9 +3497,9 @@ static void omap_lpg_tick(void *opaque) struct omap_lpg_s *s = opaque; if (s->cycle) - qemu_mod_timer(s->tm, qemu_get_clock_ms(rt_clock) + s->period - s->on); + qemu_mod_timer(s->tm, qemu_get_clock_ms(vm_clock) + s->period - s->on); else - qemu_mod_timer(s->tm, qemu_get_clock_ms(rt_clock) + s->on); + qemu_mod_timer(s->tm, qemu_get_clock_ms(vm_clock) + s->on); s->cycle = !s->cycle; printf("%s: LED is %s\n", __FUNCTION__, s->cycle ? "on" : "off"); @@ -3617,7 +3617,7 @@ static struct omap_lpg_s *omap_lpg_init(MemoryRegion *system_memory, struct omap_lpg_s *s = (struct omap_lpg_s *) g_malloc0(sizeof(struct omap_lpg_s)); - s->tm = qemu_new_timer_ms(rt_clock, omap_lpg_tick, s); + s->tm = qemu_new_timer_ms(vm_clock, omap_lpg_tick, s); omap_lpg_reset(s); -- 1.7.1