From owner-svn-src-all@freebsd.org  Thu Feb 11 11:21:47 2016
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 0895FAA5ECA;
 Thu, 11 Feb 2016 11:21:47 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 CD38AB62;
 Thu, 11 Feb 2016 11:21:46 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1BBLjf5041225;
 Thu, 11 Feb 2016 11:21:45 GMT (envelope-from br@FreeBSD.org)
Received: (from br@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1BBLjFj041224;
 Thu, 11 Feb 2016 11:21:45 GMT (envelope-from br@FreeBSD.org)
Message-Id: <201602111121.u1BBLjFj041224@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org
 using -f
From: Ruslan Bukin <br@FreeBSD.org>
Date: Thu, 11 Feb 2016 11:21:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295508 - head/sys/riscv/htif
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: Thu, 11 Feb 2016 11:21:47 -0000

Author: br
Date: Thu Feb 11 11:21:45 2016
New Revision: 295508
URL: https://svnweb.freebsd.org/changeset/base/295508

Log:
  Stop device enumeration when we see first empty slot.
  This fixes operation in QEMU and saves some booting time as well.
  
  Pointed out by:	Sagar Karandikar <skarandikar@berkeley.edu>
  Sponsored by:	DARPA, AFRL
  Sponsored by:	HEIF5

Modified:
  head/sys/riscv/htif/htif.c

Modified: head/sys/riscv/htif/htif.c
==============================================================================
--- head/sys/riscv/htif/htif.c	Thu Feb 11 10:48:15 2016	(r295507)
+++ head/sys/riscv/htif/htif.c	Thu Feb 11 11:21:45 2016	(r295508)
@@ -183,9 +183,8 @@ htif_enumerate(struct htif_softc *sc)
 		}
 
 		len = strnlen(id, sizeof(id));
-		if (len <= 0) {
-			continue;
-		}
+		if (len <= 0)
+			break;
 
 		if (bootverbose)
 			printf(" %d %s\n", i, id);