61 lines
2.0 KiB
Diff
61 lines
2.0 KiB
Diff
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Tue, 10 Nov 2015 05:24:00 -0700
|
|
Subject: KVM: x86: rename update_db_bp_intercept to update_bp_intercept
|
|
Origin: https://bugzilla.novell.com/attachment.cgi?id=655406
|
|
|
|
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>
|
|
---
|
|
arch/x86/include/asm/kvm_host.h | 2 +-
|
|
arch/x86/kvm/svm.c | 2 +-
|
|
arch/x86/kvm/vmx.c | 2 +-
|
|
arch/x86/kvm/x86.c | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/arch/x86/include/asm/kvm_host.h
|
|
+++ b/arch/x86/include/asm/kvm_host.h
|
|
@@ -739,7 +739,7 @@ struct kvm_x86_ops {
|
|
void (*vcpu_load)(struct kvm_vcpu *vcpu, int cpu);
|
|
void (*vcpu_put)(struct kvm_vcpu *vcpu);
|
|
|
|
- void (*update_db_bp_intercept)(struct kvm_vcpu *vcpu);
|
|
+ void (*update_bp_intercept)(struct kvm_vcpu *vcpu);
|
|
int (*get_msr)(struct kvm_vcpu *vcpu, struct msr_data *msr);
|
|
int (*set_msr)(struct kvm_vcpu *vcpu, struct msr_data *msr);
|
|
u64 (*get_segment_base)(struct kvm_vcpu *vcpu, int seg);
|
|
--- a/arch/x86/kvm/svm.c
|
|
+++ b/arch/x86/kvm/svm.c
|
|
@@ -4374,7 +4374,7 @@ static struct kvm_x86_ops svm_x86_ops =
|
|
.vcpu_load = svm_vcpu_load,
|
|
.vcpu_put = svm_vcpu_put,
|
|
|
|
- .update_db_bp_intercept = update_bp_intercept,
|
|
+ .update_bp_intercept = update_bp_intercept,
|
|
.get_msr = svm_get_msr,
|
|
.set_msr = svm_set_msr,
|
|
.get_segment_base = svm_get_segment_base,
|
|
--- a/arch/x86/kvm/vmx.c
|
|
+++ b/arch/x86/kvm/vmx.c
|
|
@@ -10335,7 +10335,7 @@ static struct kvm_x86_ops vmx_x86_ops =
|
|
.vcpu_load = vmx_vcpu_load,
|
|
.vcpu_put = vmx_vcpu_put,
|
|
|
|
- .update_db_bp_intercept = update_exception_bitmap,
|
|
+ .update_bp_intercept = update_exception_bitmap,
|
|
.get_msr = vmx_get_msr,
|
|
.set_msr = vmx_set_msr,
|
|
.get_segment_base = vmx_get_segment_base,
|
|
--- a/arch/x86/kvm/x86.c
|
|
+++ b/arch/x86/kvm/x86.c
|
|
@@ -7184,7 +7184,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(
|
|
*/
|
|
kvm_set_rflags(vcpu, rflags);
|
|
|
|
- kvm_x86_ops->update_db_bp_intercept(vcpu);
|
|
+ kvm_x86_ops->update_bp_intercept(vcpu);
|
|
|
|
r = 0;
|
|
|