On Thu, Jul 01, 2021 at 09:30:04AM +0200, Andrew Jones wrote:
> On Thu, Jul 01, 2021 at 08:19:28AM +0100, Marc Zyngier wrote:
> > Commit b78f4a59669 ("KVM: selftests: Rename vm_handle_exception")
> > raced with a couple of new x86 tests, missing two vm_handle_exception
> > to vm_install_exception_handler conversions.
> >
> > Help the two broken tests to catch up with the new world.
> >
> > Cc: Andrew Jones <drjones@xxxxxxxxxx>
> > CC: Ricardo Koller <ricarkol@xxxxxxxxxx>
> > Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> > Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx>
> > ---
> > tools/testing/selftests/kvm/x86_64/hyperv_features.c | 2 +-
> > tools/testing/selftests/kvm/x86_64/mmu_role_test.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_features.c b/tools/testing/selftests/kvm/x86_64/hyperv_features.c
> > index 42bd658f52a8..af27c7e829c1 100644
> > --- a/tools/testing/selftests/kvm/x86_64/hyperv_features.c
> > +++ b/tools/testing/selftests/kvm/x86_64/hyperv_features.c
> > @@ -615,7 +615,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);
> >
> > pr_info("Testing access to Hyper-V specific MSRs\n");
> > guest_test_msrs_access(vm, addr_gva2hva(vm, msr_gva),
> > diff --git a/tools/testing/selftests/kvm/x86_64/mmu_role_test.c b/tools/testing/selftests/kvm/x86_64/mmu_role_test.c
> > index 523371cf8e8f..da2325fcad87 100644
> > --- a/tools/testing/selftests/kvm/x86_64/mmu_role_test.c
> > +++ b/tools/testing/selftests/kvm/x86_64/mmu_role_test.c
> > @@ -71,7 +71,7 @@ static void mmu_role_test(u32 *cpuid_reg, u32 evil_cpuid_val)
> > /* Set up a #PF handler to eat the RSVD #PF and signal all done! */
> > vm_init_descriptor_tables(vm);
> > vcpu_init_descriptor_tables(vm, VCPU_ID);
> > - vm_handle_exception(vm, PF_VECTOR, guest_pf_handler);
> > + vm_install_exception_handler(vm, PF_VECTOR, guest_pf_handler);
> >
> > r = _vcpu_run(vm, VCPU_ID);
> > TEST_ASSERT(r == 0, "vcpu_run failed: %d\n", r);
> > --
> > 2.30.2
> >
>
> Reviewed-by: Andrew Jones <drjones@xxxxxxxxxx>
>
> Hopefully vm_install_exception_handler() has now officially won the race!
>
> Thanks,
> drew
>
Reviewed-by: Ricardo Koller <ricarkol@xxxxxxxxxx>
Thanks!
Ricardo
