From: pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sun, 25 May 2008 14:05:47 +0000 (+0000)
Subject: Ignore duplicate timer run requests.
X-Git-Tag: release_0_10_0~2111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98fc56145ecedbcb4b59ebbf6b0538b20e9bda57;p=thirdparty%2Fqemu.git

Ignore duplicate timer run requests.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4575 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/hw/ptimer.c b/hw/ptimer.c
index 7dd6d3110a9..356fad7b6f6 100644
--- a/hw/ptimer.c
+++ b/hw/ptimer.c
@@ -100,6 +100,9 @@ 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) {
         fprintf(stderr, "Timer with period zero, disabling\n");
         return;