diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-10 05:55:36 -0500 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-10 06:06:25 -0500 |
commit | a96036b8ef7df9f10cd575c0d78359bd33188e8e (patch) | |
tree | 5d1ad55a49e42b7571c4d837215ba355bdff668d | |
parent | cbdb967af3d54993f5814f1cee0ed311a055377d (diff) |
KVM: x86: rename update_db_bp_intercept to update_bp_intercept
Because #DB is now intercepted unconditionally, this callback
only operates on #BP for both VMX and SVM.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | arch/x86/include/asm/kvm_host.h | 2 | ||||
-rw-r--r-- | arch/x86/kvm/svm.c | 2 | ||||
-rw-r--r-- | arch/x86/kvm/vmx.c | 2 | ||||
-rw-r--r-- | arch/x86/kvm/x86.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 456a3869a57e..30cfd64295a0 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h | |||
@@ -778,7 +778,7 @@ struct kvm_x86_ops { | |||
778 | void (*vcpu_load)(struct kvm_vcpu *vcpu, int cpu); | 778 | void (*vcpu_load)(struct kvm_vcpu *vcpu, int cpu); |
779 | void (*vcpu_put)(struct kvm_vcpu *vcpu); | 779 | void (*vcpu_put)(struct kvm_vcpu *vcpu); |
780 | 780 | ||
781 | void (*update_db_bp_intercept)(struct kvm_vcpu *vcpu); | 781 | void (*update_bp_intercept)(struct kvm_vcpu *vcpu); |
782 | int (*get_msr)(struct kvm_vcpu *vcpu, struct msr_data *msr); | 782 | int (*get_msr)(struct kvm_vcpu *vcpu, struct msr_data *msr); |
783 | int (*set_msr)(struct kvm_vcpu *vcpu, struct msr_data *msr); | 783 | int (*set_msr)(struct kvm_vcpu *vcpu, struct msr_data *msr); |
784 | u64 (*get_segment_base)(struct kvm_vcpu *vcpu, int seg); | 784 | u64 (*get_segment_base)(struct kvm_vcpu *vcpu, int seg); |
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 1cc1ffca0d8c..83a1c643f9a5 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c | |||
@@ -4279,7 +4279,7 @@ static struct kvm_x86_ops svm_x86_ops = { | |||
4279 | .vcpu_load = svm_vcpu_load, | 4279 | .vcpu_load = svm_vcpu_load, |
4280 | .vcpu_put = svm_vcpu_put, | 4280 | .vcpu_put = svm_vcpu_put, |
4281 | 4281 | ||
4282 | .update_db_bp_intercept = update_bp_intercept, | 4282 | .update_bp_intercept = update_bp_intercept, |
4283 | .get_msr = svm_get_msr, | 4283 | .get_msr = svm_get_msr, |
4284 | .set_msr = svm_set_msr, | 4284 | .set_msr = svm_set_msr, |
4285 | .get_segment_base = svm_get_segment_base, | 4285 | .get_segment_base = svm_get_segment_base, |
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 89aaedd2a91d..87acc5221740 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -10759,7 +10759,7 @@ static struct kvm_x86_ops vmx_x86_ops = { | |||
10759 | .vcpu_load = vmx_vcpu_load, | 10759 | .vcpu_load = vmx_vcpu_load, |
10760 | .vcpu_put = vmx_vcpu_put, | 10760 | .vcpu_put = vmx_vcpu_put, |
10761 | 10761 | ||
10762 | .update_db_bp_intercept = update_exception_bitmap, | 10762 | .update_bp_intercept = update_exception_bitmap, |
10763 | .get_msr = vmx_get_msr, | 10763 | .get_msr = vmx_get_msr, |
10764 | .set_msr = vmx_set_msr, | 10764 | .set_msr = vmx_set_msr, |
10765 | .get_segment_base = vmx_get_segment_base, | 10765 | .get_segment_base = vmx_get_segment_base, |
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 2cb074f5aaed..aba7f95d7a64 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -7115,7 +7115,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, | |||
7115 | */ | 7115 | */ |
7116 | kvm_set_rflags(vcpu, rflags); | 7116 | kvm_set_rflags(vcpu, rflags); |
7117 | 7117 | ||
7118 | kvm_x86_ops->update_db_bp_intercept(vcpu); | 7118 | kvm_x86_ops->update_bp_intercept(vcpu); |
7119 | 7119 | ||
7120 | r = 0; | 7120 | r = 0; |
7121 | 7121 | ||