diff options
| author | Elliott Mitchell <ehem+freebsd@m5p.com> | 2022-07-23 22:30:45 +0000 |
|---|---|---|
| committer | Roger Pau Monné <royger@FreeBSD.org> | 2023-11-28 11:51:19 +0000 |
| commit | c880f12f5ac6b1fe8b188e08862e8da829533fdb (patch) | |
| tree | 5670488d31bc65bfe68fa82db0b2affe2fa552c9 | |
| parent | b3195ed2a31f5e6179db8ce96d4ef7dd3e87a537 (diff) | |
| download | src-c880f12f5ac6b1fe8b188e08862e8da829533fdb.tar.gz src-c880f12f5ac6b1fe8b188e08862e8da829533fdb.zip | |
xen/intr: correct misuses of Xen handle pointer type
Fix a few spots where handle pointers were incorrectly used. Luckily
these appear rarely triggered given how long they've been lurking.
Fixes: 76acc41fb7c7 ("Implement vector callback for PVHVM and unify event channel implementations")
Fixes: 9f40021f288c ("Introduce a new, HVM compatible, paravirtualized timer driver for Xen.")
MFC after: 2 weeks
Reviewed by: royger
| -rw-r--r-- | sys/dev/xen/bus/xen_intr.c | 4 | ||||
| -rw-r--r-- | sys/dev/xen/timer/xen_timer.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/xen/bus/xen_intr.c b/sys/dev/xen/bus/xen_intr.c index db166a625610..b70b0fa835b6 100644 --- a/sys/dev/xen/bus/xen_intr.c +++ b/sys/dev/xen/bus/xen_intr.c @@ -866,7 +866,7 @@ xen_intr_bind_virq(device_t dev, u_int virq, u_int cpu, if (error != 0) { evtchn_close_t close = { .port = bind_virq.port }; - xen_intr_unbind(*port_handlep); + xen_intr_unbind(port_handlep); if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close)) panic("EVTCHNOP_close failed"); return (error); @@ -923,7 +923,7 @@ xen_intr_alloc_and_bind_ipi(u_int cpu, driver_filter_t filter, if (error != 0) { evtchn_close_t close = { .port = bind_ipi.port }; - xen_intr_unbind(*port_handlep); + xen_intr_unbind(port_handlep); if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close)) panic("EVTCHNOP_close failed"); return (error); diff --git a/sys/dev/xen/timer/xen_timer.c b/sys/dev/xen/timer/xen_timer.c index 93cab090c596..f42ed5fd2525 100644 --- a/sys/dev/xen/timer/xen_timer.c +++ b/sys/dev/xen/timer/xen_timer.c @@ -84,7 +84,7 @@ struct xentimer_pcpu_data { uint64_t timer; uint64_t last_processed; - void *irq_handle; + xen_intr_handle_t irq_handle; }; DPCPU_DEFINE(struct xentimer_pcpu_data, xentimer_pcpu); |