From owner-svn-src-head@FreeBSD.ORG  Mon Sep 15 15:15:53 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4CF88CC9;
 Mon, 15 Sep 2014 15:15:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 384E1F9E;
 Mon, 15 Sep 2014 15:15:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8FFFrKE042174;
 Mon, 15 Sep 2014 15:15:53 GMT (envelope-from royger@FreeBSD.org)
Received: (from royger@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8FFFrX0042173;
 Mon, 15 Sep 2014 15:15:53 GMT (envelope-from royger@FreeBSD.org)
Message-Id: <201409151515.s8FFFrX0042173@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: royger set sender to
 royger@FreeBSD.org using -f
From: Roger Pau Monné <royger@FreeBSD.org>
Date: Mon, 15 Sep 2014 15:15:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r271629 - head/sys/x86/xen
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Sep 2014 15:15:53 -0000

Author: royger
Date: Mon Sep 15 15:15:52 2014
New Revision: 271629
URL: http://svnweb.freebsd.org/changeset/base/271629

Log:
  xen: don't set suspend/resume methods for the PIRQ PIC
  
  The suspend/resume of event channels is already handled by the xen_intr_pic.
  If those methods are set on the PIRQ PIC they are just called twice, which
  breaks proper resume. This fix restores migration of FreeBSD guests to a
  working state.
  
  Sponsored by: Citrix Systems R&D

Modified:
  head/sys/x86/xen/xen_intr.c

Modified: head/sys/x86/xen/xen_intr.c
==============================================================================
--- head/sys/x86/xen/xen_intr.c	Mon Sep 15 14:43:58 2014	(r271628)
+++ head/sys/x86/xen/xen_intr.c	Mon Sep 15 15:15:52 2014	(r271629)
@@ -179,8 +179,6 @@ struct pic xen_intr_pirq_pic = {
 	.pic_disable_intr   = xen_intr_pirq_disable_intr,
 	.pic_vector         = xen_intr_vector,
 	.pic_source_pending = xen_intr_source_pending,
-	.pic_suspend        = xen_intr_suspend,
-	.pic_resume         = xen_intr_resume,
 	.pic_config_intr    = xen_intr_pirq_config_intr,
 	.pic_assign_cpu     = xen_intr_assign_cpu
 };