From owner-svn-src-projects@FreeBSD.ORG  Wed Aug  1 05:53:21 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 48078106564A;
	Wed,  1 Aug 2012 05:53:21 +0000 (UTC)
	(envelope-from grehan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 32A528FC27;
	Wed,  1 Aug 2012 05:53:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q715rLWB016033;
	Wed, 1 Aug 2012 05:53:21 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q715rLAd016031;
	Wed, 1 Aug 2012 05:53:21 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201208010553.q715rLAd016031@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Wed, 1 Aug 2012 05:53:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238966 - projects/bhyve/sys/boot/userboot/userboot
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2012 05:53:21 -0000

Author: grehan
Date: Wed Aug  1 05:53:20 2012
New Revision: 238966
URL: http://svn.freebsd.org/changeset/base/238966

Log:
  Bump up the heap size to 1MB. With a few kernel modules, libstand
  zalloc and userboot seem to want to use ~600KB of heap space, which
  results in a segfault when malloc fails in bhyveload.
  
  Reported by:  sree dot openwrk at gmail dot com

Modified:
  projects/bhyve/sys/boot/userboot/userboot/main.c

Modified: projects/bhyve/sys/boot/userboot/userboot/main.c
==============================================================================
--- projects/bhyve/sys/boot/userboot/userboot/main.c	Wed Aug  1 01:18:36 2012	(r238965)
+++ projects/bhyve/sys/boot/userboot/userboot/main.c	Wed Aug  1 05:53:20 2012	(r238966)
@@ -67,7 +67,7 @@ exit(int v)
 void
 loader_main(struct loader_callbacks_v1 *cb, void *arg, int version, int ndisks)
 {
-	static char malloc[512*1024];
+	static char malloc[1024*1024];
 	int i;
 
         if (version != USERBOOT_VERSION_1)
@@ -82,7 +82,7 @@ loader_main(struct loader_callbacks_v1 *
 	 * alloc() is usable. The stack is buried inside us, so this is
 	 * safe.
 	 */
-	setheap((void *)malloc, (void *)(malloc + 512*1024));
+	setheap((void *)malloc, (void *)(malloc + 1024*1024));
 
         /*
          * Hook up the console