git: e42c24d56b3d - main - vmm: Remove unused vcpuid argument from vioapic_process_eoi.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 18 Nov 2022 18:26:45 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=e42c24d56b3d949aafd0c916e30ab91a4fe1e24d
commit e42c24d56b3d949aafd0c916e30ab91a4fe1e24d
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-11-18 18:03:39 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-11-18 18:25:37 +0000
vmm: Remove unused vcpuid argument from vioapic_process_eoi.
Reviewed by: corvink, markj
Differential Revision: https://reviews.freebsd.org/D37166
---
sys/amd64/vmm/io/vioapic.c | 2 +-
sys/amd64/vmm/io/vioapic.h | 2 +-
sys/amd64/vmm/io/vlapic.c | 3 +--
sys/amd64/vmm/vmm.c | 3 +--
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/sys/amd64/vmm/io/vioapic.c b/sys/amd64/vmm/io/vioapic.c
index aee58849dd7d..e41b5acac920 100644
--- a/sys/amd64/vmm/io/vioapic.c
+++ b/sys/amd64/vmm/io/vioapic.c
@@ -455,7 +455,7 @@ vioapic_mmio_write(struct vcpu *vcpu, uint64_t gpa, uint64_t wval,
}
void
-vioapic_process_eoi(struct vm *vm, int vcpuid, int vector)
+vioapic_process_eoi(struct vm *vm, int vector)
{
struct vioapic *vioapic;
int pin;
diff --git a/sys/amd64/vmm/io/vioapic.h b/sys/amd64/vmm/io/vioapic.h
index e45975c548a8..988321a6435c 100644
--- a/sys/amd64/vmm/io/vioapic.h
+++ b/sys/amd64/vmm/io/vioapic.h
@@ -51,7 +51,7 @@ int vioapic_mmio_read(struct vcpu *vcpu, uint64_t gpa,
uint64_t *rval, int size, void *arg);
int vioapic_pincount(struct vm *vm);
-void vioapic_process_eoi(struct vm *vm, int vcpuid, int vector);
+void vioapic_process_eoi(struct vm *vm, int vector);
#ifdef BHYVE_SNAPSHOT
int vioapic_snapshot(struct vioapic *vioapic,
struct vm_snapshot_meta *meta);
diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c
index 67a09401efb1..664852260943 100644
--- a/sys/amd64/vmm/io/vlapic.c
+++ b/sys/amd64/vmm/io/vlapic.c
@@ -593,8 +593,7 @@ vlapic_process_eoi(struct vlapic *vlapic)
vlapic->isrvec_stk_top--;
vlapic_update_ppr(vlapic);
if ((tmrptr[idx] & (1 << bitpos)) != 0) {
- vioapic_process_eoi(vlapic->vm, vlapic->vcpuid,
- vector);
+ vioapic_process_eoi(vlapic->vm, vector);
}
return;
}
diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c
index f19076f27bb9..2ee57895d852 100644
--- a/sys/amd64/vmm/vmm.c
+++ b/sys/amd64/vmm/vmm.c
@@ -1813,8 +1813,7 @@ restart:
error = vm_handle_suspend(vm, vcpuid, &retu);
break;
case VM_EXITCODE_IOAPIC_EOI:
- vioapic_process_eoi(vm, vcpuid,
- vme->u.ioapic_eoi.vector);
+ vioapic_process_eoi(vm, vme->u.ioapic_eoi.vector);
break;
case VM_EXITCODE_RENDEZVOUS:
error = vm_handle_rendezvous(vcpu);