Commit 8d93c874 authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Paolo Bonzini
Browse files

KVM: x86: move nsec_to_cycles from x86.c to x86.h 



Move the inline function nsec_to_cycles from x86.c to x86.h, as
the next patch uses it from lapic.c.

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ed911b43

arch/x86/kvm/x86.c

+0 −6
Original line number Diff line number Diff line
@@ -1244,12 +1244,6 @@ static atomic_t kvm_guest_has_master_clock = ATOMIC_INIT(0); 
static DEFINE_PER_CPU(unsigned long, cpu_tsc_khz);

static unsigned long max_tsc_khz;



static inline u64 nsec_to_cycles(struct kvm_vcpu *vcpu, u64 nsec)

{

	return pvclock_scale_delta(nsec, vcpu->arch.virtual_tsc_mult,

				   vcpu->arch.virtual_tsc_shift);

}



static u32 adjust_tsc_khz(u32 khz, s32 ppm)

{

	u64 v = (u64)khz * (1000000 + ppm);

arch/x86/kvm/x86.h

+7 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define ARCH_X86_KVM_X86_H



#include <linux/kvm_host.h>

#include <asm/pvclock.h>

#include "kvm_cache_regs.h"



#define MSR_IA32_CR_PAT_DEFAULT  0x0007040600070406ULL
@@ -195,6 +196,12 @@ extern unsigned int lapic_timer_advance_ns; 


extern struct static_key kvm_no_apic_vcpu;



static inline u64 nsec_to_cycles(struct kvm_vcpu *vcpu, u64 nsec)

{

	return pvclock_scale_delta(nsec, vcpu->arch.virtual_tsc_mult,

				   vcpu->arch.virtual_tsc_shift);

}



/* Same "calling convention" as do_div:

 * - divide (n << 32) by base

 * - put result in n