From c0ae523ba7e627902db3d1d2e201e3db4a4e0128 Mon Sep 17 00:00:00 2001 From: cperciva Date: Thu, 6 Jan 2011 22:55:53 +0000 Subject: [PATCH] MFS r217055: Don't panic when a disk is detached on XEN. Approved by: re (rwatson) git-svn-id: svn://svn.freebsd.org/base/releng/8.2@217083 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/xen/evtchn/evtchn.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys/xen/evtchn/evtchn.c b/sys/xen/evtchn/evtchn.c index 3ad2e2cc..b4053eb0 100644 --- a/sys/xen/evtchn/evtchn.c +++ b/sys/xen/evtchn/evtchn.c @@ -628,6 +628,7 @@ static void xenpic_dynirq_enable_source(struct intsrc *isrc); static void xenpic_dynirq_disable_source(struct intsrc *isrc, int); static void xenpic_dynirq_eoi_source(struct intsrc *isrc); static void xenpic_dynirq_enable_intr(struct intsrc *isrc); +static void xenpic_dynirq_disable_intr(struct intsrc *isrc); static void xenpic_pirq_enable_source(struct intsrc *isrc); static void xenpic_pirq_disable_source(struct intsrc *isrc, int); @@ -647,6 +648,7 @@ struct pic xenpic_dynirq_template = { .pic_disable_source = xenpic_dynirq_disable_source, .pic_eoi_source = xenpic_dynirq_eoi_source, .pic_enable_intr = xenpic_dynirq_enable_intr, + .pic_disable_intr = xenpic_dynirq_disable_intr, .pic_vector = xenpic_vector, .pic_source_pending = xenpic_source_pending, .pic_suspend = xenpic_suspend, @@ -715,6 +717,20 @@ xenpic_dynirq_enable_intr(struct intsrc *isrc) mtx_unlock_spin(&irq_mapping_update_lock); } +static void +xenpic_dynirq_disable_intr(struct intsrc *isrc) +{ + unsigned int irq; + struct xenpic_intsrc *xp; + + xp = (struct xenpic_intsrc *)isrc; + mtx_lock_spin(&irq_mapping_update_lock); + irq = xenpic_vector(isrc); + mask_evtchn(evtchn_from_irq(irq)); + xp->xp_masked = 1; + mtx_unlock_spin(&irq_mapping_update_lock); +} + static void xenpic_dynirq_eoi_source(struct intsrc *isrc) { -- 2.42.0