mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-16 17:23:55 +08:00
KVM: selftests: Rename vm_handle_exception
Rename the vm_handle_exception function to a name that indicates more clearly that it installs something: vm_install_exception_handler. Reported-by: kernel test robot <oliver.sang@intel.com> Suggested-by: Marc Zyngier <maz@kernel.org> Suggested-by: Andrew Jones <drjones@redhat.com> Signed-off-by: Ricardo Koller <ricarkol@google.com> Reviewed-by: Andrew Jones <drjones@redhat.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20210611011020.3420067-2-ricarkol@google.com
This commit is contained in:
parent
8124c8a6b3
commit
b78f4a5966
@ -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_exception_handler(struct kvm_vm *vm, int vector,
|
||||
void (*handler)(struct ex_regs *));
|
||||
|
||||
/*
|
||||
|
@ -1244,8 +1244,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_exception_handler(struct kvm_vm *vm, int vector,
|
||||
void (*handler)(struct ex_regs *))
|
||||
{
|
||||
vm_vaddr_t *handlers = (vm_vaddr_t *)addr_gva2hva(vm, vm->handlers);
|
||||
|
||||
|
@ -154,8 +154,8 @@ int main(int argc, char *argv[])
|
||||
|
||||
vm_init_descriptor_tables(vm);
|
||||
vcpu_init_descriptor_tables(vm, VCPU_ID);
|
||||
vm_handle_exception(vm, UD_VECTOR, guest_ud_handler);
|
||||
vm_handle_exception(vm, NMI_VECTOR, guest_nmi_handler);
|
||||
vm_install_exception_handler(vm, UD_VECTOR, guest_ud_handler);
|
||||
vm_install_exception_handler(vm, NMI_VECTOR, guest_nmi_handler);
|
||||
|
||||
pr_info("Running L1 which uses EVMCS to run L2\n");
|
||||
|
||||
|
@ -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_exception_handler(vm, GP_VECTOR, guest_gp_handler);
|
||||
|
||||
enter_guest(vm);
|
||||
kvm_vm_free(vm);
|
||||
|
@ -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_exception_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_exception_handler(vm, UD_VECTOR, guest_ud_handler);
|
||||
run_guest(vm);
|
||||
vm_handle_exception(vm, UD_VECTOR, NULL);
|
||||
vm_install_exception_handler(vm, UD_VECTOR, NULL);
|
||||
|
||||
if (process_ucall(vm) != UCALL_DONE) {
|
||||
vm_handle_exception(vm, GP_VECTOR, guest_fep_gp_handler);
|
||||
vm_install_exception_handler(vm, GP_VECTOR, guest_fep_gp_handler);
|
||||
|
||||
/* Process emulated rdmsr and wrmsr instructions. */
|
||||
run_guest_then_process_rdmsr(vm, MSR_IA32_XSS);
|
||||
|
@ -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_exception_handler(vm, IPI_VECTOR, guest_ipi_handler);
|
||||
|
||||
virt_pg_map(vm, APIC_DEFAULT_GPA, APIC_DEFAULT_GPA, 0);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user