From owner-svn-src-all@FreeBSD.ORG  Thu Mar  5 13:52:31 2015
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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B9774401;
 Thu,  5 Mar 2015 13:52:31 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A3FD6AAF;
 Thu,  5 Mar 2015 13:52:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t25DqVEm064870;
 Thu, 5 Mar 2015 13:52:31 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t25DqVTd064869;
 Thu, 5 Mar 2015 13:52:31 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201503051352.t25DqVTd064869@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 5 Mar 2015 13:52:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279657 - 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.18-1
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, 05 Mar 2015 13:52:31 -0000

Author: mav
Date: Thu Mar  5 13:52:30 2015
New Revision: 279657
URL: https://svnweb.freebsd.org/changeset/base/279657

Log:
  Add check for absent stripe size to r279652.
  
  MFC after:	2 weeks

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 Mar  5 12:40:59 2015	(r279656)
+++ head/usr.sbin/bhyve/pci_virtio_block.c	Thu Mar  5 13:52:30 2015	(r279657)
@@ -311,7 +311,7 @@ pci_vtblk_init(struct vmctx *ctx, struct
 		}
 		assert(size != 0);
 		assert(sectsz != 0);
-		if (ioctl(fd, DIOCGSTRIPESIZE, &sts) == 0)
+		if (ioctl(fd, DIOCGSTRIPESIZE, &sts) == 0 && sts > 0)
 			ioctl(fd, DIOCGSTRIPEOFFSET, &sto);
 	} else
 		sts = sbuf.st_blksize;