From owner-p4-projects@FreeBSD.ORG  Tue Jan  1 06:28:56 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3A66C16A420; Tue,  1 Jan 2008 06:28:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0017516A418
	for <perforce@freebsd.org>; Tue,  1 Jan 2008 06:28:55 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E420C13C458
	for <perforce@freebsd.org>; Tue,  1 Jan 2008 06:28:55 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m016Stdk013512
	for <perforce@freebsd.org>; Tue, 1 Jan 2008 06:28:55 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m016Stcv013509
	for perforce@freebsd.org; Tue, 1 Jan 2008 06:28:55 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 1 Jan 2008 06:28:55 GMT
Message-Id: <200801010628.m016Stcv013509@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 132223 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Jan 2008 06:28:56 -0000

http://perforce.freebsd.org/chv.cgi?CH=132223

Change 132223 by kmacy@pandemonium:kmacy:xen31 on 2008/01/01 06:28:11

	mark interrupts as masked when not enabled and unmasked when enabled

Affected files ...

.. //depot/projects/xen31/sys/xen/evtchn/evtchn.c#5 edit

Differences ...

==== //depot/projects/xen31/sys/xen/evtchn/evtchn.c#5 (text+ko) ====

@@ -659,7 +659,11 @@
 xenpic_dynirq_enable_intr(struct intsrc *isrc)
 {
 	unsigned int irq;
+	struct xenpic_intsrc *xp;
+	
+	xp = (struct xenpic_intsrc *)isrc;	
 	mtx_lock_spin(&irq_mapping_update_lock);
+	xp->xp_masked = 0;
 	irq = xenpic_vector(isrc);
 	unmask_evtchn(evtchn_from_irq(irq));
 	mtx_unlock_spin(&irq_mapping_update_lock);
@@ -669,7 +673,11 @@
 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);
+	xp->xp_masked = 1;
 	irq = xenpic_vector(isrc);
 	mask_evtchn(evtchn_from_irq(irq));
 	mtx_unlock_spin(&irq_mapping_update_lock);
@@ -679,8 +687,11 @@
 xenpic_dynirq_eoi_source(struct intsrc *isrc)
 {
 	unsigned int irq;
-
+	struct xenpic_intsrc *xp;
+	
+	xp = (struct xenpic_intsrc *)isrc;	
 	mtx_lock_spin(&irq_mapping_update_lock);
+	xp->xp_masked = 0;
 	irq = xenpic_vector(isrc);
 	unmask_evtchn(evtchn_from_irq(irq));
 	mtx_unlock_spin(&irq_mapping_update_lock);
@@ -703,7 +714,8 @@
     struct xenpic_intsrc *pin = (struct xenpic_intsrc *)isrc;
 
 	/* XXXEN: TODO */
-	printf("xenpic_source_pending(): vector=%x,masked=%x\n", pin->xp_vector, pin->xp_masked);
+	printf("xenpic_source_pending(): vector=%x,masked=%x\n",
+	    pin->xp_vector, pin->xp_masked);
 
 /*	notify_remote_via_evtchn(pin->xp_vector); // XXX RS: Is this correct? */
 	return 0;