Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit a96036b8 authored Nov 10, 2015 by Paolo Bonzini

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>

parent cbdb967a

arch/x86/include/asm/kvm_host.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -778,7 +778,7 @@ struct kvm_x86_ops {
	void (vcpu_load)(struct kvm_vcpu vcpu, int cpu);		void (vcpu_load)(struct kvm_vcpu vcpu, int cpu);
	void (vcpu_put)(struct kvm_vcpu vcpu);		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 (get_msr)(struct kvm_vcpu vcpu, struct msr_data *msr);
	int (set_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);		u64 (get_segment_base)(struct kvm_vcpu vcpu, int seg);

arch/x86/kvm/svm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4279,7 +4279,7 @@ static struct kvm_x86_ops svm_x86_ops = {
	.vcpu_load = svm_vcpu_load,		.vcpu_load = svm_vcpu_load,
	.vcpu_put = svm_vcpu_put,		.vcpu_put = svm_vcpu_put,

	.update_db_bp_intercept = update_bp_intercept,		.update_bp_intercept = update_bp_intercept,
	.get_msr = svm_get_msr,		.get_msr = svm_get_msr,
	.set_msr = svm_set_msr,		.set_msr = svm_set_msr,
	.get_segment_base = svm_get_segment_base,		.get_segment_base = svm_get_segment_base,

arch/x86/kvm/vmx.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10759,7 +10759,7 @@ static struct kvm_x86_ops vmx_x86_ops = {
	.vcpu_load = vmx_vcpu_load,		.vcpu_load = vmx_vcpu_load,
	.vcpu_put = vmx_vcpu_put,		.vcpu_put = vmx_vcpu_put,

	.update_db_bp_intercept = update_exception_bitmap,		.update_bp_intercept = update_exception_bitmap,
	.get_msr = vmx_get_msr,		.get_msr = vmx_get_msr,
	.set_msr = vmx_set_msr,		.set_msr = vmx_set_msr,
	.get_segment_base = vmx_get_segment_base,		.get_segment_base = vmx_get_segment_base,

arch/x86/kvm/x86.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7115,7 +7115,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
	*/		*/
	kvm_set_rflags(vcpu, rflags);		kvm_set_rflags(vcpu, rflags);

	kvm_x86_ops->update_db_bp_intercept(vcpu);		kvm_x86_ops->update_bp_intercept(vcpu);

	r = 0;		r = 0;