git: 63f32b7af988 - stable/13 - vmm: Restore the correct vm_inject_*() prototypes
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 26 Jan 2023 22:11:56 UTC
The branch stable/13 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=63f32b7af988e094ae38d23f776633a7e31d8a5d
commit 63f32b7af988e094ae38d23f776633a7e31d8a5d
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2022-11-18 19:11:21 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-01-26 22:00:48 +0000
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
(cherry picked from commit ca6b48f08034114edf1fa19cdc088021af2eddf3)
---
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 7c9393128df0..dd1bae47fc41 100644
--- a/sys/amd64/include/vmm.h
+++ b/sys/amd64/include/vmm.h
@@ -791,27 +791,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);