From owner-svn-src-all@FreeBSD.ORG  Thu Sep 26 16:25:07 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 57481482;
 Thu, 26 Sep 2013 16:25:07 +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 448342729;
 Thu, 26 Sep 2013 16:25:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8QGP7IB023889;
 Thu, 26 Sep 2013 16:25:07 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8QGP7rA023888;
 Thu, 26 Sep 2013 16:25:07 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201309261625.r8QGP7rA023888@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Thu, 26 Sep 2013 16:25:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255890 - 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: Thu, 26 Sep 2013 16:25:07 -0000

Author: grehan
Date: Thu Sep 26 16:25:06 2013
New Revision: 255890
URL: http://svnweb.freebsd.org/changeset/base/255890

Log:
  Fix incorrect assertion on the minimum side. ZFS would
  trigger this.
  
  Reported by:	Chris Torek, Allan Jude
  Approved by:	re@ (blanket)

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

Modified: head/usr.sbin/bhyve/pci_virtio_block.c
==============================================================================
--- head/usr.sbin/bhyve/pci_virtio_block.c	Thu Sep 26 16:07:30 2013	(r255889)
+++ head/usr.sbin/bhyve/pci_virtio_block.c	Thu Sep 26 16:25:06 2013	(r255890)
@@ -156,7 +156,7 @@ pci_vtblk_proc(struct pci_vtblk_softc *s
 	 * XXX - note - this fails on crash dump, which does a
 	 * VIRTIO_BLK_T_FLUSH with a zero transfer length
 	 */
-	assert (n >= 3 && n <= VTBLK_MAXSEGS + 2);
+	assert(n >= 2 && n <= VTBLK_MAXSEGS + 2);
 
 	assert((flags[0] & VRING_DESC_F_WRITE) == 0);
 	assert(iov[0].iov_len == sizeof(struct virtio_blk_hdr));