diff options
| author | Jan Beulich <jbeulich@suse.com> | 2013-04-11 12:07:55 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-04-11 12:07:55 +0200 |
| commit | eb60be3dd870aecfa47bed1118069680389c15f7 (patch) | |
| tree | c18d1981b786b01dab2c0617af63fc1db0d3b0bb | |
| parent | d1efb7702b0d112cf6e2f561aa60dc184642d525 (diff) | |
| download | xen-eb60be3dd870aecfa47bed1118069680389c15f7.tar.gz xen-eb60be3dd870aecfa47bed1118069680389c15f7.tar.bz2 xen-eb60be3dd870aecfa47bed1118069680389c15f7.zip | |
x86: don't pass negative time to gtime_to_gtsc()
scale_delta(), which is being called by that function, doesn't cope
with that.
Also print a warning message, so hopefully we can eventually figure why
occasionally a negative value results from the calculation in the first
place.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
| -rw-r--r-- | xen/arch/x86/time.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index b403f4711e..6e94847a49 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -854,7 +854,16 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) if ( is_hvm_domain(d) ) { struct pl_time *pl = &v->domain->arch.hvm_domain.pl_time; + stime += pl->stime_offset + v->arch.hvm_vcpu.stime_offset; + if ( (s64)stime < 0 ) + { + printk(XENLOG_G_WARNING "d%dv%d: bogus time %" PRId64 + " (offsets %" PRId64 "/%" PRId64 ")\n", + d->domain_id, v->vcpu_id, stime, + pl->stime_offset, v->arch.hvm_vcpu.stime_offset); + stime = 0; + } } tsc_stamp = gtime_to_gtsc(d, stime); } |