From ca6b48f08034114edf1fa19cdc088021af2eddf3 Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Fri, 18 Nov 2022 14:11:21 -0500 Subject: [PATCH] vmm: Restore the correct vm_inject_*() prototypes Fixes: 80cb5d845b8f ("vmm: Pass vcpu instead of vm and vcpuid...") Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D37443 --- sys/amd64/include/vmm.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index fddc15d2f17..16423288a65 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -795,27 +795,27 @@ void vm_inject_fault(void *vm, int vcpuid, int vector, int errcode_valid, int errcode); static __inline void -vm_inject_ud(struct vcpu *vcpu) +vm_inject_ud(void *vm, int vcpuid) { - vm_inject_fault(vcpu, IDT_UD, 0, 0); + vm_inject_fault(vm, vcpuid, IDT_UD, 0, 0); } static __inline void -vm_inject_gp(struct vcpu *vcpu) +vm_inject_gp(void *vm, int vcpuid) { - vm_inject_fault(vcpu, IDT_GP, 1, 0); + vm_inject_fault(vm, vcpuid, IDT_GP, 1, 0); } static __inline void -vm_inject_ac(struct vcpu *vcpu, int errcode) +vm_inject_ac(void *vm, int vcpuid, int errcode) { - vm_inject_fault(vcpu, IDT_AC, 1, errcode); + vm_inject_fault(vm, vcpuid, IDT_AC, 1, errcode); } static __inline void -vm_inject_ss(struct vcpu *vcpu, int errcode) +vm_inject_ss(void *vm, int vcpuid, int errcode) { - vm_inject_fault(vcpu, IDT_SS, 1, errcode); + vm_inject_fault(vm, vcpuid, IDT_SS, 1, errcode); } void vm_inject_pf(void *vm, int vcpuid, int error_code, uint64_t cr2);