Hi Ricardo,
On 5/1/21 1:24 AM, Ricardo Koller wrote:
> Rename the vm_handle_exception function to a name that indicates more
> clearly that it installs something: vm_install_vector_handler.
>
> Suggested-by: Marc Zyngier <maz@xxxxxxxxxx>
> Suggested-by: Andrew Jones <drjones@xxxxxxxxxx>
> Signed-off-by: Ricardo Koller <ricarkol@xxxxxxxxxx>
Reviewed-by: Eric Auger <eric.auger@xxxxxxxxxx>
Thanks
Eric
> ---
> tools/testing/selftests/kvm/include/x86_64/processor.h | 2 +-
> tools/testing/selftests/kvm/lib/x86_64/processor.c | 4 ++--
> tools/testing/selftests/kvm/x86_64/kvm_pv_test.c | 2 +-
> .../selftests/kvm/x86_64/userspace_msr_exit_test.c | 8 ++++----
> tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c | 2 +-
> 5 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools/testing/selftests/kvm/include/x86_64/processor.h
> index 0b30b4e15c38..12889d3e8948 100644
> --- a/tools/testing/selftests/kvm/include/x86_64/processor.h
> +++ b/tools/testing/selftests/kvm/include/x86_64/processor.h
> @@ -391,7 +391,7 @@ struct ex_regs {
>
> void vm_init_descriptor_tables(struct kvm_vm *vm);
> void vcpu_init_descriptor_tables(struct kvm_vm *vm, uint32_t vcpuid);
> -void vm_handle_exception(struct kvm_vm *vm, int vector,
> +void vm_install_vector_handler(struct kvm_vm *vm, int vector,
> void (*handler)(struct ex_regs *));
>
> /*
> diff --git a/tools/testing/selftests/kvm/lib/x86_64/processor.c b/tools/testing/selftests/kvm/lib/x86_64/processor.c
> index a8906e60a108..e156061263a6 100644
> --- a/tools/testing/selftests/kvm/lib/x86_64/processor.c
> +++ b/tools/testing/selftests/kvm/lib/x86_64/processor.c
> @@ -1250,8 +1250,8 @@ void vcpu_init_descriptor_tables(struct kvm_vm *vm, uint32_t vcpuid)
> *(vm_vaddr_t *)addr_gva2hva(vm, (vm_vaddr_t)(&exception_handlers)) = vm->handlers;
> }
>
> -void vm_handle_exception(struct kvm_vm *vm, int vector,
> - void (*handler)(struct ex_regs *))
> +void vm_install_vector_handler(struct kvm_vm *vm, int vector,
> + void (*handler)(struct ex_regs *))
> {
> vm_vaddr_t *handlers = (vm_vaddr_t *)addr_gva2hva(vm, vm->handlers);
>
> diff --git a/tools/testing/selftests/kvm/x86_64/kvm_pv_test.c b/tools/testing/selftests/kvm/x86_64/kvm_pv_test.c
> index 732b244d6956..5ae5f748723a 100644
> --- a/tools/testing/selftests/kvm/x86_64/kvm_pv_test.c
> +++ b/tools/testing/selftests/kvm/x86_64/kvm_pv_test.c
> @@ -227,7 +227,7 @@ int main(void)
>
> vm_init_descriptor_tables(vm);
> vcpu_init_descriptor_tables(vm, VCPU_ID);
> - vm_handle_exception(vm, GP_VECTOR, guest_gp_handler);
> + vm_install_vector_handler(vm, GP_VECTOR, guest_gp_handler);
>
> enter_guest(vm);
> kvm_vm_free(vm);
> diff --git a/tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c b/tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c
> index 72c0d0797522..20c373e2d329 100644
> --- a/tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c
> +++ b/tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c
> @@ -574,7 +574,7 @@ static void test_msr_filter_allow(void) {
> vm_init_descriptor_tables(vm);
> vcpu_init_descriptor_tables(vm, VCPU_ID);
>
> - vm_handle_exception(vm, GP_VECTOR, guest_gp_handler);
> + vm_install_vector_handler(vm, GP_VECTOR, guest_gp_handler);
>
> /* Process guest code userspace exits. */
> run_guest_then_process_rdmsr(vm, MSR_IA32_XSS);
> @@ -588,12 +588,12 @@ static void test_msr_filter_allow(void) {
> run_guest_then_process_wrmsr(vm, MSR_NON_EXISTENT);
> run_guest_then_process_rdmsr(vm, MSR_NON_EXISTENT);
>
> - vm_handle_exception(vm, UD_VECTOR, guest_ud_handler);
> + vm_install_vector_handler(vm, UD_VECTOR, guest_ud_handler);
> run_guest(vm);
> - vm_handle_exception(vm, UD_VECTOR, NULL);
> + vm_install_vector_handler(vm, UD_VECTOR, NULL);
>
> if (process_ucall(vm) != UCALL_DONE) {
> - vm_handle_exception(vm, GP_VECTOR, guest_fep_gp_handler);
> + vm_install_vector_handler(vm, GP_VECTOR, guest_fep_gp_handler);
>
> /* Process emulated rdmsr and wrmsr instructions. */
> run_guest_then_process_rdmsr(vm, MSR_IA32_XSS);
> diff --git a/tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c b/tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c
> index 2f964cdc273c..ded70ff465d5 100644
> --- a/tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c
> +++ b/tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c
> @@ -462,7 +462,7 @@ int main(int argc, char *argv[])
>
> vm_init_descriptor_tables(vm);
> vcpu_init_descriptor_tables(vm, HALTER_VCPU_ID);
> - vm_handle_exception(vm, IPI_VECTOR, guest_ipi_handler);
> + vm_install_vector_handler(vm, IPI_VECTOR, guest_ipi_handler);
>
> virt_pg_map(vm, APIC_DEFAULT_GPA, APIC_DEFAULT_GPA, 0);
>
>
