svn commit: r291645 - stable/10/sys/x86/xen

[Roger Pau Monné]

Author: royger
Date: Wed Dec  2 10:26:34 2015
New Revision: 291645
URL: https://svnweb.freebsd.org/changeset/base/291645

Log:
  MFC r291023:
  
  xen/intr: properly dispose event channels on resume
  
  Sponsored by:		Citrix Systems R&D

Modified:
  stable/10/sys/x86/xen/xen_intr.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/x86/xen/xen_intr.c
==============================================================================
--- stable/10/sys/x86/xen/xen_intr.c	Wed Dec  2 10:23:54 2015	(r291644)
+++ stable/10/sys/x86/xen/xen_intr.c	Wed Dec  2 10:26:34 2015	(r291645)
@@ -711,7 +711,10 @@ xen_intr_resume(struct pic *unused, bool
 				xen_rebind_virq(isrc);
 				break;
 			default:
+				intr_remove_handler(isrc->xi_cookie);
 				isrc->xi_cpu = 0;
+				isrc->xi_type = EVTCHN_TYPE_UNBOUND;
+				isrc->xi_cookie = NULL;
 				break;
 			}
 		}