Message ID | 1430709529-4653-1-git-send-email-edgar.iglesias@gmail.com |
---|---|
State | New |
Headers | show |
On 04/05/2015 05:18, Edgar E. Iglesias wrote: > From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com> > > Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> > --- > hw/core/ptimer.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c > index 2abad1f..8437bd6 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; > } > > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
On Mon, May 04, 2015 at 11:27:36AM +0200, Paolo Bonzini wrote: > > > On 04/05/2015 05:18, Edgar E. Iglesias wrote: > > From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com> > > > > Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> > > --- > > hw/core/ptimer.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c > > index 2abad1f..8437bd6 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; > > } > > > > > > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Thanks, I've applied this one. Cheers, Edgar
diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c index 2abad1f..8437bd6 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; }