aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2008-05-25 14:05:47 +0000
committerpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2008-05-25 14:05:47 +0000
commit98fc56145ecedbcb4b59ebbf6b0538b20e9bda57 (patch)
tree9ecb0e9a4171d88bdd344b2c59e20861df2ae40e
parent8384dd67fec5652a09ada4576214abfafab32c0c (diff)
Ignore duplicate timer run requests.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4575 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--hw/ptimer.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/ptimer.c b/hw/ptimer.c
index 7dd6d3110a..356fad7b6f 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;