summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdgar E. Iglesias2014-09-10 10:33:58 +0200
committerEdgar E. Iglesias2015-05-08 09:15:23 +0200
commitf8340b360b9bc29d48716ba8aca79df2b9544979 (patch)
treebfe58fed82b8428d96458f059820cdd01922b688
parentMerge remote-tracking branch 'remotes/juanquintela/tags/migration/20150507-1'... (diff)
downloadqemu-f8340b360b9bc29d48716ba8aca79df2b9544979.tar.gz
qemu-f8340b360b9bc29d48716ba8aca79df2b9544979.tar.xz
qemu-f8340b360b9bc29d48716ba8aca79df2b9544979.zip
hw/ptimer: Do not artificially limit timers when using icount
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
-rw-r--r--hw/core/ptimer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c
index 2abad1fa3d..8437bd6e8b 100644
--- a/hw/core/ptimer.c
+++ b/hw/core/ptimer.c
@@ -189,7 +189,7 @@ void ptimer_set_limit(ptimer_state *s, uint64_t limit, int reload)
* on the current generation of host machines.
*/
- if (limit * s->period < 10000 && s->period) {
+ if (!use_icount && limit * s->period < 10000 && s->period) {
limit = 10000 / s->period;
}