From owner-svn-src-all@FreeBSD.ORG  Tue Sep 17 18:42:13 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id E944BCE4;
 Tue, 17 Sep 2013 18:42:13 +0000 (UTC)
 (envelope-from grehan@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D6BDE29AD;
 Tue, 17 Sep 2013 18:42:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HIgDi7016455;
 Tue, 17 Sep 2013 18:42:13 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8HIgDIk016454;
 Tue, 17 Sep 2013 18:42:13 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201309171842.r8HIgDIk016454@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Tue, 17 Sep 2013 18:42:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255647 - head/usr.sbin/bhyve
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Sep 2013 18:42:14 -0000

Author: grehan
Date: Tue Sep 17 18:42:13 2013
New Revision: 255647
URL: http://svnweb.freebsd.org/changeset/base/255647

Log:
  Pass the number of supported vectors to pci_emul_add_msicap() and
  not the actual PCI BAR number.
  
  Reviewed by:	neel
  Approved by:	re@ (blanket)

Modified:
  head/usr.sbin/bhyve/virtio.c

Modified: head/usr.sbin/bhyve/virtio.c
==============================================================================
--- head/usr.sbin/bhyve/virtio.c	Tue Sep 17 18:41:32 2013	(r255646)
+++ head/usr.sbin/bhyve/virtio.c	Tue Sep 17 18:42:13 2013	(r255647)
@@ -139,7 +139,8 @@ vi_intr_init(struct virtio_softc *vs, in
 			return (1);
 	} else {
 		vs->vs_flags &= ~VIRTIO_USE_MSIX;
-		pci_emul_add_msicap(vs->vs_pi, barnum);
+		/* Only 1 MSI vector for bhyve */
+		pci_emul_add_msicap(vs->vs_pi, 1);
 	}
 	return (0);
 }