diff options
| author | Jan Beulich <jbeulich@suse.com> | 2013-07-11 14:21:48 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-07-11 14:21:48 +0200 |
| commit | 094c1cb9757a3456ea63491a1c0d6016bdfa2711 (patch) | |
| tree | bf7af904d1cbc4d403f3880164d6499b68019dfb | |
| parent | 8109c123702e2387b0781f3feaa4b53744464009 (diff) | |
| download | xen-094c1cb9757a3456ea63491a1c0d6016bdfa2711.tar.gz xen-094c1cb9757a3456ea63491a1c0d6016bdfa2711.tar.bz2 xen-094c1cb9757a3456ea63491a1c0d6016bdfa2711.zip | |
x86: don't pass negative time to gtime_to_gtsc() (try 2)
This mostly reverts commit eb60be3d ("x86: don't pass negative time to
gtime_to_gtsc()") and instead corrects __update_vcpu_system_time()'s
handling of this_cpu(cpu_time).stime_local_stamp dating back before the
start of a HVM guest (which would otherwise lead to a negative value
getting passed to gtime_to_gtsc(), causing scale_delta() to produce
meaningless output).
Flushing the value to zero was wrong, and printing a message for
something that can validly happen wasn't very useful either.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
master commit: 5ad914bc867c5a6a4957869c89918f4e1f9dd9c4
master date: 2013-07-02 08:48:03 +0200
| -rw-r--r-- | xen/arch/x86/time.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 4c6c2339e8..2e7b019b86 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -834,16 +834,13 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) 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; - } + if ( stime >= 0 ) + tsc_stamp = gtime_to_gtsc(d, stime); + else + tsc_stamp = -gtime_to_gtsc(d, -stime); } - tsc_stamp = gtime_to_gtsc(d, stime); + else + tsc_stamp = gtime_to_gtsc(d, stime); } else { |