From owner-svn-src-all@freebsd.org  Fri Oct  2 02:09:51 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2891BA0ECC0;
 Fri,  2 Oct 2015 02:09:51 +0000 (UTC)
 (envelope-from grehan@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 19BE419A0;
 Fri,  2 Oct 2015 02:09:51 +0000 (UTC)
 (envelope-from grehan@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9229omC021605;
 Fri, 2 Oct 2015 02:09:50 GMT (envelope-from grehan@FreeBSD.org)
Received: (from grehan@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9229oW8021604;
 Fri, 2 Oct 2015 02:09:50 GMT (envelope-from grehan@FreeBSD.org)
Message-Id: <201510020209.t9229oW8021604@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: grehan set sender to
 grehan@FreeBSD.org using -f
From: Peter Grehan <grehan@FreeBSD.org>
Date: Fri, 2 Oct 2015 02:09:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r288470 - 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.20
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Oct 2015 02:09:51 -0000

Author: grehan
Date: Fri Oct  2 02:09:50 2015
New Revision: 288470
URL: https://svnweb.freebsd.org/changeset/base/288470

Log:
  - Increase the max number of indirect descriptors to match
    the largest that the Windows virtio driver can send down
  
  - Always advertize indirect descriptors. The Illumos virtio
    driver won't attach unless this capability is seen.
  
  Reviewed by:	neel

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

Modified: head/usr.sbin/bhyve/pci_virtio_net.c
==============================================================================
--- head/usr.sbin/bhyve/pci_virtio_net.c	Fri Oct  2 02:08:40 2015	(r288469)
+++ head/usr.sbin/bhyve/pci_virtio_net.c	Fri Oct  2 02:09:50 2015	(r288470)
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
 
 #define VTNET_RINGSZ	1024
 
-#define VTNET_MAXSEGS	32
+#define VTNET_MAXSEGS	256
 
 /*
  * Host capabilities.  Note that we only offer a few of these.
@@ -84,7 +84,7 @@ __FBSDID("$FreeBSD$");
 
 #define VTNET_S_HOSTCAPS      \
   ( VIRTIO_NET_F_MAC | VIRTIO_NET_F_MRG_RXBUF | VIRTIO_NET_F_STATUS | \
-    VIRTIO_F_NOTIFY_ON_EMPTY)
+    VIRTIO_F_NOTIFY_ON_EMPTY | VIRTIO_RING_F_INDIRECT_DESC)
 
 /*
  * PCI config-space "registers"