From owner-svn-src-head@FreeBSD.ORG  Sat Mar 16 05:40:30 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 426A9321;
 Sat, 16 Mar 2013 05:40:30 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 340E421C;
 Sat, 16 Mar 2013 05:40:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2G5eULH025785;
 Sat, 16 Mar 2013 05:40:30 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2G5eTlC025783;
 Sat, 16 Mar 2013 05:40:29 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201303160540.r2G5eTlC025783@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Sat, 16 Mar 2013 05:40:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248368 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
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: Sat, 16 Mar 2013 05:40:30 -0000

Author: neel
Date: Sat Mar 16 05:40:29 2013
New Revision: 248368
URL: http://svnweb.freebsd.org/changeset/base/248368

Log:
  Change the type of 'ndesc' from 'int' to 'uint16_t' so that descriptor index
  wraparound is handled correctly.
  
  The gory details are available here:
  http://lists.freebsd.org/pipermail/freebsd-virtualization/2013-March/001119.html
  
  This fixes a regression introduced in r247871.
  
  Pointed out by:	Bruce Evans, Chris Torek

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	Sat Mar 16 04:08:01 2013	(r248367)
+++ head/usr.sbin/bhyve/pci_virtio_net.c	Sat Mar 16 05:40:29 2013	(r248368)
@@ -170,7 +170,7 @@ pci_vtnet_iosize(struct pci_devinst *pi)
 static int
 hq_num_avail(struct vring_hqueue *hq)
 {
-	int ndesc;
+	uint16_t ndesc;
 
 	/*
 	 * We're just computing (a-b) in GF(216).