2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 04:34:11 +08:00

x86: KVM guest: kvm_get_tsc_khz: return khz, not lpj

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>
This commit is contained in:
Eduardo Habkost 2008-12-05 18:36:45 -02:00 committed by Avi Kivity
parent ad218f85e3
commit e93353c93a

View File

@ -89,17 +89,17 @@ static cycle_t kvm_clock_read(void)
*/ */
static unsigned long kvm_get_tsc_khz(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) static void kvm_get_preset_lpj(void)
{ {
struct pvclock_vcpu_time_info *src;
unsigned long khz; unsigned long khz;
u64 lpj; u64 lpj;
src = &per_cpu(hv_clock, 0); khz = kvm_get_tsc_khz();
khz = pvclock_tsc_khz(src);
lpj = ((u64)khz * 1000); lpj = ((u64)khz * 1000);
do_div(lpj, HZ); do_div(lpj, HZ);