Module Name: src
Committed By: thorpej
Date: Mon Dec 23 13:35:37 UTC 2019
Modified Files:
src/sys/arch/xen/include: intr.h
src/sys/arch/xen/x86: xen_intr.c
Log Message:
Provide XEN stubs for intr_mask() / intr_unmask().
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/xen/include/intr.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/xen/x86/xen_intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/include/intr.h
diff -u src/sys/arch/xen/include/intr.h:1.52 src/sys/arch/xen/include/intr.h:1.53
--- src/sys/arch/xen/include/intr.h:1.52 Sat Feb 2 12:32:55 2019
+++ src/sys/arch/xen/include/intr.h Mon Dec 23 13:35:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.52 2019/02/02 12:32:55 cherry Exp $ */
+/* $NetBSD: intr.h,v 1.53 2019/12/23 13:35:37 thorpej Exp $ */
/* NetBSD intr.h,v 1.15 2004/10/31 10:39:34 yamt Exp */
/*-
@@ -91,6 +91,8 @@ void *xen_intr_establish_xname(int, stru
void *, bool, const char *);
void *xen_intr_establish(int, struct pic *, int, int, int, int (*)(void *),
void *, bool);
+void xen_intr_mask(struct intrhand *);
+void xen_intr_unmask(struct intrhand *);
void xen_intr_disestablish(struct intrhand *);
#endif /* !_LOCORE */
Index: src/sys/arch/xen/x86/xen_intr.c
diff -u src/sys/arch/xen/x86/xen_intr.c:1.17 src/sys/arch/xen/x86/xen_intr.c:1.18
--- src/sys/arch/xen/x86/xen_intr.c:1.17 Fri Jun 7 12:43:52 2019
+++ src/sys/arch/xen/x86/xen_intr.c Mon Dec 23 13:35:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_intr.c,v 1.17 2019/06/07 12:43:52 cherry Exp $ */
+/* $NetBSD: xen_intr.c,v 1.18 2019/12/23 13:35:37 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_intr.c,v 1.17 2019/06/07 12:43:52 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_intr.c,v 1.18 2019/12/23 13:35:37 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -241,6 +241,26 @@ xen_intr_establish_xname(int legacy_irq,
}
/*
+ * Mask an interrupt source.
+ */
+void
+xen_intr_mask(struct intrhand *ih)
+{
+ /* XXX */
+ panic("xen_intr_mask: not yet implemented.");
+}
+
+/*
+ * Unmask an interrupt source.
+ */
+void
+xen_intr_unmask(struct intrhand *ih)
+{
+ /* XXX */
+ panic("xen_intr_unmask: not yet implemented.");
+}
+
+/*
* Deregister an interrupt handler.
*/
void
@@ -510,6 +530,8 @@ __strong_alias(intr_string, xintr_string
__strong_alias(intr_create_intrid, xen_intr_create_intrid);
__strong_alias(intr_establish, xen_intr_establish);
__strong_alias(intr_establish_xname, xen_intr_establish_xname);
+__strong_alias(intr_mask, xen_intr_mask);
+__strong_alias(intr_unmask, xen_intr_unmask);
__strong_alias(intr_disestablish, xen_intr_disestablish);
__strong_alias(cpu_intr_redistribute, xen_cpu_intr_redistribute);
__strong_alias(cpu_intr_count, xen_cpu_intr_count);
