Commit 1aa8ceef authored Mar 09, 2011 by Nikola Ciprich Committed by Marcelo Tosatti Mar 17, 2011

KVM: fix kvmclock regression due to missing clock update



commit 387b9f97750444728962b236987fbe8ee8cc4f8c moved kvm_request_guest_time_update(vcpu),
breaking 32bit SMP guests using kvm-clock. Fix this by moving (new) clock update function
to proper place.

Signed-off-by: Nikola Ciprich <nikola.ciprich@linuxbox.cz>
Acked-by: Zachary Amsden <zamsden@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

parent 399a40c9

arch/x86/kvm/x86.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2127,8 +2127,8 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
		if (check_tsc_unstable()) {
		kvm_x86_ops->adjust_tsc_offset(vcpu, -tsc_delta);
		vcpu->arch.tsc_catchup = 1;
		kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu);
		}
		kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu);
		if (vcpu->cpu != cpu)
		kvm_migrate_timers(vcpu);
		vcpu->cpu = cpu;

Admin message