lkml.org 
[lkml]   [2008]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 36/36] x86: KVM guest: kvm_get_tsc_khz: return khz, not lpj
    Date
    From: Eduardo Habkost <ehabkost@redhat.com>

    kvm_get_tsc_khz() currently returns the previously-calculated preset_lpj
    value, but it is in loops-per-jiffy, not kHz. The current code works
    correctly only when HZ=1000.

    Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
    ---
    arch/x86/kernel/kvmclock.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
    index b38e801..652fce6 100644
    --- a/arch/x86/kernel/kvmclock.c
    +++ b/arch/x86/kernel/kvmclock.c
    @@ -89,17 +89,17 @@ static cycle_t kvm_clock_read(void)
    */
    static unsigned long kvm_get_tsc_khz(void)
    {
    - return preset_lpj;
    + struct pvclock_vcpu_time_info *src;
    + src = &per_cpu(hv_clock, 0);
    + return pvclock_tsc_khz(src);
    }

    static void kvm_get_preset_lpj(void)
    {
    - struct pvclock_vcpu_time_info *src;
    unsigned long khz;
    u64 lpj;

    - src = &per_cpu(hv_clock, 0);
    - khz = pvclock_tsc_khz(src);
    + khz = kvm_get_tsc_khz();

    lpj = ((u64)khz * 1000);
    do_div(lpj, HZ);
    --
    1.6.0.3


    \
     
     \ /
      Last update: 2008-12-14 09:19    [W:5.080 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site