Re: [PATCH] KVM: x86: fix kvmclock breakage from timers branch merge

Chris J Arges
2014-09-04T20:43:06Z

On 09/04/2014 03:40 PM, Paolo Bonzini wrote:
> Il 04/09/2014 22:37, Chris J Arges ha scritto:
>>>> - boot_ns = ktime_to_ns(ktime_add(tk->tkr.base_mono, tk->offs_boot));
>>>> + boot_ns = ktime_to_ns(ktime_sub(tk->offs_real, tk->offs_boot));
>>>>
>>>> write_seqcount_begin(&vdata->seq);
>>>>
>>>> If it doesn't work, then commit 02cba1598a2a3b689e79ad6dad2532521f638271
>>>> is also broken.
>>>>
>>>> Paolo
>>>>
>> Paolo,
>> That modification do your additional patch didn't work. However I was
>> able to modify the code as follows to get this test case working. The
>> only additional modification was:
>> + vdata->nsec_base = tk->xtime_sec * (u64)NSEC_PER_SEC
>> + - boot_ns;
>
> Right, it should have been
>
> boot_ns = ktime_to_ns(ktime_sub(tk->offs_boot, tk->offs_real));
>
> I'll post the patch shortly.
>
> Thanks!
>
> Paolo
>

Paolo,

Great, tested that modification really quick and it also works for me!
All test cases are now passing on my machine; thanks for all the
debugging and help.

--chris