git: 197cb60d7af4 - stable/13 - vmm ppt: Remove unused vcpu arg from MSI setup handlers.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 26 Jan 2023 22:12:01 UTC
The branch stable/13 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=197cb60d7af4e9bc2ba0b15bda24289111c87fe8
commit 197cb60d7af4e9bc2ba0b15bda24289111c87fe8
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-11-18 18:03:46 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-01-26 22:02:43 +0000
vmm ppt: Remove unused vcpu arg from MSI setup handlers.
Reviewed by: corvink, markj
Differential Revision: https://reviews.freebsd.org/D37167
(cherry picked from commit 0cbc39d53d2270fa77255c663a0cfa5ed502ab0a)
---
sys/amd64/vmm/io/ppt.c | 4 ++--
sys/amd64/vmm/io/ppt.h | 4 ++--
sys/amd64/vmm/vmm_dev.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys/amd64/vmm/io/ppt.c b/sys/amd64/vmm/io/ppt.c
index 3782b7b510f6..ea04c3245671 100644
--- a/sys/amd64/vmm/io/ppt.c
+++ b/sys/amd64/vmm/io/ppt.c
@@ -545,7 +545,7 @@ pptintr(void *arg)
}
int
-ppt_setup_msi(struct vm *vm, int vcpu, int bus, int slot, int func,
+ppt_setup_msi(struct vm *vm, int bus, int slot, int func,
uint64_t addr, uint64_t msg, int numvec)
{
int i, rid, flags;
@@ -638,7 +638,7 @@ ppt_setup_msi(struct vm *vm, int vcpu, int bus, int slot, int func,
}
int
-ppt_setup_msix(struct vm *vm, int vcpu, int bus, int slot, int func,
+ppt_setup_msix(struct vm *vm, int bus, int slot, int func,
int idx, uint64_t addr, uint64_t msg, uint32_t vector_control)
{
struct pptdev *ppt;
diff --git a/sys/amd64/vmm/io/ppt.h b/sys/amd64/vmm/io/ppt.h
index e6339f57b8ad..e7833c2a73bb 100644
--- a/sys/amd64/vmm/io/ppt.h
+++ b/sys/amd64/vmm/io/ppt.h
@@ -36,9 +36,9 @@ int ppt_map_mmio(struct vm *vm, int bus, int slot, int func,
vm_paddr_t gpa, size_t len, vm_paddr_t hpa);
int ppt_unmap_mmio(struct vm *vm, int bus, int slot, int func,
vm_paddr_t gpa, size_t len);
-int ppt_setup_msi(struct vm *vm, int vcpu, int bus, int slot, int func,
+int ppt_setup_msi(struct vm *vm, int bus, int slot, int func,
uint64_t addr, uint64_t msg, int numvec);
-int ppt_setup_msix(struct vm *vm, int vcpu, int bus, int slot, int func,
+int ppt_setup_msix(struct vm *vm, int bus, int slot, int func,
int idx, uint64_t addr, uint64_t msg, uint32_t vector_control);
int ppt_disable_msix(struct vm *vm, int bus, int slot, int func);
int ppt_assigned_devices(struct vm *vm);
diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c
index 2f487dbb132e..1d36e190c7a6 100644
--- a/sys/amd64/vmm/vmm_dev.c
+++ b/sys/amd64/vmm/vmm_dev.c
@@ -540,14 +540,14 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag,
}
case VM_PPTDEV_MSI:
pptmsi = (struct vm_pptdev_msi *)data;
- error = ppt_setup_msi(sc->vm, pptmsi->vcpu,
+ error = ppt_setup_msi(sc->vm,
pptmsi->bus, pptmsi->slot, pptmsi->func,
pptmsi->addr, pptmsi->msg,
pptmsi->numvec);
break;
case VM_PPTDEV_MSIX:
pptmsix = (struct vm_pptdev_msix *)data;
- error = ppt_setup_msix(sc->vm, pptmsix->vcpu,
+ error = ppt_setup_msix(sc->vm,
pptmsix->bus, pptmsix->slot,
pptmsix->func, pptmsix->idx,
pptmsix->addr, pptmsix->msg,