From owner-svn-src-projects@FreeBSD.ORG  Thu Oct 11 19:28:08 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9B8FF565;
 Thu, 11 Oct 2012 19:28:08 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 854D08FC17;
 Thu, 11 Oct 2012 19:28:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9BJS8Mo073251;
 Thu, 11 Oct 2012 19:28:08 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9BJS8p5073249;
 Thu, 11 Oct 2012 19:28:08 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201210111928.q9BJS8p5073249@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Thu, 11 Oct 2012 19:28:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r241452 - projects/bhyve/sys/amd64/vmm/io
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Oct 2012 19:28:08 -0000

Author: neel
Date: Thu Oct 11 19:28:07 2012
New Revision: 241452
URL: http://svn.freebsd.org/changeset/base/241452

Log:
  Deliver the MSI to the correct guest virtual cpu.
  
  Prior to this change the MSI was being delivered unconditionally to vcpu 0
  regardless of how the guest programmed the MSI delivery.

Modified:
  projects/bhyve/sys/amd64/vmm/io/ppt.c

Modified: projects/bhyve/sys/amd64/vmm/io/ppt.c
==============================================================================
--- projects/bhyve/sys/amd64/vmm/io/ppt.c	Thu Oct 11 18:41:32 2012	(r241451)
+++ projects/bhyve/sys/amd64/vmm/io/ppt.c	Thu Oct 11 19:28:07 2012	(r241452)
@@ -71,8 +71,6 @@ static struct pptdev {
 	struct vm_memory_segment mmio[MAX_MMIOSEGS];
 	struct {
 		int	num_msgs;		/* guest state */
-		int	vector;
-		int	vcpu;
 
 		int	startrid;		/* host state */
 		struct resource *res[MAX_MSIMSGS];
@@ -478,8 +476,6 @@ ppt_setup_msi(struct vm *vm, int vcpu, i
 		}
 	}
 	
-	ppt->msi.vector = vector;
-	ppt->msi.vcpu = destcpu;
 	ppt->msi.startrid = startrid;
 
 	/*
@@ -497,6 +493,7 @@ ppt_setup_msi(struct vm *vm, int vcpu, i
 
 		ppt->msi.arg[i].pptdev = ppt;
 		ppt->msi.arg[i].vec = vector + i;
+		ppt->msi.arg[i].vcpu = destcpu;
 
 		error = bus_setup_intr(ppt->dev, ppt->msi.res[i],
 				       INTR_TYPE_NET | INTR_MPSAFE,