summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2007-06-03 10:44:47 +0000
committerpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2007-06-03 10:44:47 +0000
commit62ea5b0bd38471ef114ca2e2dd7507a778701cd3 (patch)
treebfc1e16634b49e14acf169eaeec2ab0039ff4844 /hw
parentcaf8fe8c32596480b2e2809f29061f4a386de7ae (diff)
downloadqemu-62ea5b0bd38471ef114ca2e2dd7507a778701cd3.tar.gz
qemu-62ea5b0bd38471ef114ca2e2dd7507a778701cd3.tar.bz2
qemu-62ea5b0bd38471ef114ca2e2dd7507a778701cd3.zip
Leave running timer alone if not reloading.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2923 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/ptimer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ptimer.c b/hw/ptimer.c
index feabefed96..2abf285afe 100644
--- a/hw/ptimer.c
+++ b/hw/ptimer.c
@@ -149,7 +149,7 @@ void ptimer_set_limit(ptimer_state *s, uint64_t limit, int reload)
s->limit = limit;
if (reload)
s->delta = limit;
- if (s->enabled) {
+ if (s->enabled && reload) {
s->next_event = qemu_get_clock(vm_clock);
ptimer_reload(s);
}