From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arun Sharma <arun.sharma@intel.com>
Subject: [PATCH][5/5] Register the portio handler only once.
Date: Fri, 1 Jul 2005 11:57:42 -0700
Message-ID: <20050701185742.GA32302@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Ian Pratt <Ian.Pratt@cl.cam.ac.uk>, Keir Fraser <Keir.Fraser@cl.cam.ac.uk>
Cc: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

Register the portio handler only once.

Signed-off-by: Arun Sharma <arun.sharma@intel.com>

diff -r d7bcd6f56b15 -r 63fd76ad669f xen/arch/x86/vmx_intercept.c
--- a/xen/arch/x86/vmx_intercept.c	Thu Jun 30 22:27:41 2005
+++ b/xen/arch/x86/vmx_intercept.c	Thu Jun 30 23:22:26 2005
@@ -216,7 +216,7 @@
     shared_iopage_t *sp = get_sp(d->domain);
     u64 *intr = &(sp->sp_global.pic_intr[0]);
     struct vmx_virpit_t *vpit = &(d->domain->arch.vmx_platform.vmx_pit);
-    int rw_mode;
+    int rw_mode, reinit = 0;
 
     /* load init count*/
     if (p->state == STATE_IORESP_HOOK) { 
@@ -224,6 +224,7 @@
         if ( active_ac_timer(&(vpit->pit_timer)) ) {
             VMX_DBG_LOG(DBG_LEVEL_1, "VMX_PIT: guest reset PIT with channel %lx!\n", (unsigned long) ((p->u.data >> 24) & 0x3) );
             rem_ac_timer(&(vpit->pit_timer));
+            reinit = 1;
         }
         else
             init_ac_timer(&vpit->pit_timer, pit_timer_fn, vpit, 0);
@@ -268,7 +269,8 @@
         p->state = STATE_IORESP_READY;
 
 	/* register handler to intercept the PIT io when vm_exit */
-	register_portio_handler(0x40, 4, intercept_pit_io); 
+        if (!reinit)
+	    register_portio_handler(0x40, 4, intercept_pit_io); 
     }
 
 }