d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xen/intr: remove type argument from xen_intr_alloc_isrc()

Browse Source 
This value doesn't need to be set in xen_intr_alloc_isrc().  What is
needed is simply to ensure the allocated xenisrc won't appear as free,
even if xi_type is written non-atomically.  Since the type is no longer
used to indicate free or not, the calling function should take care of
all non-architecture initialization.

Reviewed by: royger
Differential Revision: https://reviews.freebsd.org/D31188
This commit is contained in:
Elliott Mitchell 2021-07-02 08:07:58 -07:00 committed by Roger Pau Monné
parent d0a69069bb
commit 373301019f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/x86/xen/xen_intr.c
View File

@ -260,7 +260,7 @@ evtchn_cpu_unmask_port(u_int cpu, evtchn_port_t port)
* object or NULL.
*/
static struct xenisrc *
xen_intr_alloc_isrc(enum evtchn_type type)
xen_intr_alloc_isrc(void)
{
static int warned;
struct xenisrc *isrc;
@ -279,7 +279,6 @@ xen_intr_alloc_isrc(enum evtchn_type type)
KASSERT(isrc->xi_arch.intsrc.is_handlers == 0,
("Free evtchn still has handlers"));
isrc->xi_type = type;
return (isrc);
}
@ -302,7 +301,6 @@ xen_intr_alloc_isrc(enum evtchn_type type)
isrc = malloc(sizeof(*isrc), M_XENINTR, M_WAITOK | M_ZERO);
isrc->xi_arch.intsrc.is_pic = &xen_intr_pic;
isrc->xi_arch.vector = vector;
isrc->xi_type = type;
error = intr_register_source(&isrc->xi_arch.intsrc);
if (error != 0)
panic("%s(): failed registering interrupt %u, error=%d\n",
@ -394,11 +392,12 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port,
}
*port_handlep = NULL;
isrc = xen_intr_alloc_isrc(type);
isrc = xen_intr_alloc_isrc();
if (isrc == NULL)
return (ENOSPC);
isrc->xi_cookie = NULL;
isrc->xi_type = type;
isrc->xi_port = local_port;
isrc->xi_close = false;
isrc->xi_cpu = 0;