diff options
| author | Jan Beulich <jbeulich@suse.com> | 2013-07-11 15:09:07 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-07-11 15:09:07 +0200 |
| commit | 4e5c53055025170124213e8cb4844e66f2f6ec12 (patch) | |
| tree | 6eb46083ffdadddecc99f1b283285f371da5a2c1 | |
| parent | 7f6ed24eb4b4b0ab29152bd7a315e5825c7ff791 (diff) | |
| download | xen-4e5c53055025170124213e8cb4844e66f2f6ec12.tar.gz xen-4e5c53055025170124213e8cb4844e66f2f6ec12.tar.bz2 xen-4e5c53055025170124213e8cb4844e66f2f6ec12.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 a176b88df6..c2fc955183 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -823,16 +823,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 { |