Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a5611af authored by Yi Wang's avatar Yi Wang Committed by Paolo Bonzini
Browse files

kvm: x86: some tsc debug cleanup 



There are some pr_debug in TSC code, which may have
been no use, so remove them as Paolo suggested.

Signed-off-by: default avatarYi Wang <wang.yi59@zte.com.cn>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 9481b7f1

arch/x86/kvm/x86.c

+0 −8
Original line number Diff line number Diff line
@@ -1540,9 +1540,6 @@ static void kvm_get_time_scale(uint64_t scaled_hz, uint64_t base_hz, 


	*pshift = shift;

	*pmultiplier = div_frac(scaled64, tps32);



	pr_debug("%s: base_hz %llu => %llu, shift %d, mul %u\n",

		 __func__, base_hz, scaled_hz, shift, *pmultiplier);

}



#ifdef CONFIG_X86_64
@@ -1785,12 +1782,10 @@ void kvm_write_tsc(struct kvm_vcpu *vcpu, struct msr_data *msr) 
	    vcpu->arch.virtual_tsc_khz == kvm->arch.last_tsc_khz) {

		if (!kvm_check_tsc_unstable()) {

			offset = kvm->arch.cur_tsc_offset;

			pr_debug("kvm: matched tsc offset for %llu\n", data);

		} else {

			u64 delta = nsec_to_cycles(vcpu, elapsed);

			data += delta;

			offset = kvm_compute_tsc_offset(vcpu, data);

			pr_debug("kvm: adjusted tsc offset by %llu\n", delta);

		}

		matched = true;

		already_matched = (vcpu->arch.this_tsc_generation == kvm->arch.cur_tsc_generation);
@@ -1809,8 +1804,6 @@ void kvm_write_tsc(struct kvm_vcpu *vcpu, struct msr_data *msr) 
		kvm->arch.cur_tsc_write = data;

		kvm->arch.cur_tsc_offset = offset;

		matched = false;

		pr_debug("kvm: new tsc generation %llu, clock %llu\n",

			 kvm->arch.cur_tsc_generation, data);

	}



	/*
@@ -6911,7 +6904,6 @@ static void kvm_timer_init(void) 
		cpufreq_register_notifier(&kvmclock_cpufreq_notifier_block,

					  CPUFREQ_TRANSITION_NOTIFIER);

	}

	pr_debug("kvm: max_tsc_khz = %ld\n", max_tsc_khz);



	cpuhp_setup_state(CPUHP_AP_X86_KVM_CLK_ONLINE, "x86/kvm/clk:online",

			  kvmclock_cpu_online, kvmclock_cpu_down_prep);