aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2008-05-13 09:29:20 -0400
committerAvi Kivity <avi@qumranet.com>2008-07-20 05:42:25 -0400
commit7cc8883074b040aa8c1ebd3a17463b0ea3a9ef16 (patch)
tree79feae8f0093534317d75f1776bd9f115d62dd91 /arch/x86
parent543e42436643d68ad007d0bae2f485caac9c8a02 (diff)
KVM: Remove decache_vcpus_on_cpu() and related callbacks
Obsoleted by the vmx-specific per-cpu list. Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kvm/svm.c5
-rw-r--r--arch/x86/kvm/vmx.c6
-rw-r--r--arch/x86/kvm/x86.c8
3 files changed, 0 insertions, 19 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 9390a31c06f4..238e8f3afaf4 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -709,10 +709,6 @@ static void svm_vcpu_put(struct kvm_vcpu *vcpu)
709 rdtscll(vcpu->arch.host_tsc); 709 rdtscll(vcpu->arch.host_tsc);
710} 710}
711 711
712static void svm_vcpu_decache(struct kvm_vcpu *vcpu)
713{
714}
715
716static void svm_cache_regs(struct kvm_vcpu *vcpu) 712static void svm_cache_regs(struct kvm_vcpu *vcpu)
717{ 713{
718 struct vcpu_svm *svm = to_svm(vcpu); 714 struct vcpu_svm *svm = to_svm(vcpu);
@@ -1933,7 +1929,6 @@ static struct kvm_x86_ops svm_x86_ops = {
1933 .prepare_guest_switch = svm_prepare_guest_switch, 1929 .prepare_guest_switch = svm_prepare_guest_switch,
1934 .vcpu_load = svm_vcpu_load, 1930 .vcpu_load = svm_vcpu_load,
1935 .vcpu_put = svm_vcpu_put, 1931 .vcpu_put = svm_vcpu_put,
1936 .vcpu_decache = svm_vcpu_decache,
1937 1932
1938 .set_guest_debug = svm_guest_debug, 1933 .set_guest_debug = svm_guest_debug,
1939 .get_msr = svm_get_msr, 1934 .get_msr = svm_get_msr,
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 4d179d106376..b99bb37e5dec 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -692,11 +692,6 @@ static void vmx_fpu_deactivate(struct kvm_vcpu *vcpu)
692 update_exception_bitmap(vcpu); 692 update_exception_bitmap(vcpu);
693} 693}
694 694
695static void vmx_vcpu_decache(struct kvm_vcpu *vcpu)
696{
697 vcpu_clear(to_vmx(vcpu));
698}
699
700static unsigned long vmx_get_rflags(struct kvm_vcpu *vcpu) 695static unsigned long vmx_get_rflags(struct kvm_vcpu *vcpu)
701{ 696{
702 return vmcs_readl(GUEST_RFLAGS); 697 return vmcs_readl(GUEST_RFLAGS);
@@ -3114,7 +3109,6 @@ static struct kvm_x86_ops vmx_x86_ops = {
3114 .prepare_guest_switch = vmx_save_host_state, 3109 .prepare_guest_switch = vmx_save_host_state,
3115 .vcpu_load = vmx_vcpu_load, 3110 .vcpu_load = vmx_vcpu_load,
3116 .vcpu_put = vmx_vcpu_put, 3111 .vcpu_put = vmx_vcpu_put,
3117 .vcpu_decache = vmx_vcpu_decache,
3118 3112
3119 .set_guest_debug = set_guest_debug, 3113 .set_guest_debug = set_guest_debug,
3120 .guest_debug_pre = kvm_guest_debug_pre, 3114 .guest_debug_pre = kvm_guest_debug_pre,
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 8c14ddcaba70..fd03b4465bcc 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -817,14 +817,6 @@ out:
817 return r; 817 return r;
818} 818}
819 819
820/*
821 * Make sure that a cpu that is being hot-unplugged does not have any vcpus
822 * cached on it.
823 */
824void decache_vcpus_on_cpu(int cpu)
825{
826}
827
828int kvm_dev_ioctl_check_extension(long ext) 820int kvm_dev_ioctl_check_extension(long ext)
829{ 821{
830 int r; 822 int r;