From patchwork Fri Aug 20 08:07:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zachary Amsden X-Patchwork-Id: 120502 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7K89iOC002787 for ; Fri, 20 Aug 2010 08:09:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752463Ab0HTIJ3 (ORCPT ); Fri, 20 Aug 2010 04:09:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48312 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752211Ab0HTIJ0 (ORCPT ); Fri, 20 Aug 2010 04:09:26 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7K89Lao016048 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 20 Aug 2010 04:09:22 -0400 Received: from mysore (vpn-9-158.rdu.redhat.com [10.11.9.158]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o7K87qfS027969; Fri, 20 Aug 2010 04:09:19 -0400 From: Zachary Amsden To: kvm@vger.kernel.org Cc: Zachary Amsden , Avi Kivity , Marcelo Tosatti , Glauber Costa , Thomas Gleixner , John Stultz , linux-kernel@vger.kernel.org Subject: [KVM timekeeping 34/35] Remove dead code Date: Thu, 19 Aug 2010 22:07:48 -1000 Message-Id: <1282291669-25709-35-git-send-email-zamsden@redhat.com> In-Reply-To: <1282291669-25709-1-git-send-email-zamsden@redhat.com> References: <1282291669-25709-1-git-send-email-zamsden@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 20 Aug 2010 08:09:45 +0000 (UTC) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index a7fa24e..23d5138 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1179,11 +1179,6 @@ static int kvm_guest_time_update(struct kvm_vcpu *v) return 0; } -static void kvm_request_clock_update(struct kvm_vcpu *v) -{ - kvm_make_request(KVM_REQ_CLOCK_UPDATE, v); -} - static inline bool kvm_unstable_smp_clock(struct kvm *kvm) { return check_tsc_unstable() && atomic_read(&kvm->online_vcpus) > 1; @@ -1218,7 +1213,7 @@ static void kvm_update_tsc_trapping(struct kvm *kvm) */ kvm_for_each_vcpu(i, vcpu, kvm) { vcpu->arch.tsc_mode = best_tsc_mode(vcpu); - kvm_request_clock_update(vcpu); + kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu); } } @@ -1559,7 +1554,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data) /* Disable / enable trapping for kvmclock */ vcpu->arch.tsc_mode = best_tsc_mode(vcpu); - kvm_request_clock_update(vcpu); + kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu); break; } case MSR_IA32_MCG_CTL: @@ -4499,7 +4494,7 @@ static int kvmclock_cpufreq_notifier(struct notifier_block *nb, unsigned long va continue; if (freq->new > kvm->arch.virtual_tsc_khz) vcpu->arch.tsc_overrun = 1; - kvm_request_clock_update(vcpu); + kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu); if (vcpu->cpu != smp_processor_id()) send_ipi = 1; } @@ -5197,7 +5192,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) /* Running on slower TSC without kvmclock, we must bump TSC */ if (vcpu->arch.tsc_rebase) - kvm_request_clock_update(vcpu); + kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu); preempt_enable(); @@ -5791,7 +5786,7 @@ int kvm_arch_hardware_enable(void *garbage) list_for_each_entry(kvm, &vm_list, vm_list) kvm_for_each_vcpu(i, vcpu, kvm) if (vcpu->cpu == smp_processor_id()) - kvm_request_clock_update(vcpu); + kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu); return kvm_x86_ops->hardware_enable(garbage); }