From owner-svn-src-projects@FreeBSD.ORG  Tue Oct  2 04:41:44 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 7887D106564A;
	Tue,  2 Oct 2012 04:41:44 +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 640588FC0C;
	Tue,  2 Oct 2012 04:41:44 +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 q924fiDd069247;
	Tue, 2 Oct 2012 04:41:44 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q924filC069244;
	Tue, 2 Oct 2012 04:41:44 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201210020441.q924filC069244@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Tue, 2 Oct 2012 04:41:44 +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: r241121 - in projects/bhyve/sys/boot: common
	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: Tue, 02 Oct 2012 04:41:44 -0000

Author: grehan
Date: Tue Oct  2 04:41:43 2012
New Revision: 241121
URL: http://svn.freebsd.org/changeset/base/241121

Log:
  Fix the error return in disk_readslicetab() when an MBR/GPT partition
  wasn't found, and use that in userdisk_open() to allow raw disks
  and ISO images to be read.
  
  This is a temporary fix - disk.c has changed a lot in CURRENT so this
  code may be reworked or made redundant on the next IFC. It is useful
  to be able to boot from CD in the meantime.

Modified:
  projects/bhyve/sys/boot/common/disk.c
  projects/bhyve/sys/boot/userboot/userboot/userboot_disk.c

Modified: projects/bhyve/sys/boot/common/disk.c
==============================================================================
--- projects/bhyve/sys/boot/common/disk.c	Tue Oct  2 04:36:37 2012	(r241120)
+++ projects/bhyve/sys/boot/common/disk.c	Tue Oct  2 04:41:43 2012	(r241121)
@@ -192,6 +192,7 @@ disk_readslicetab(struct disk_devdesc *d
 	 */
 	if (buf[0x1fe] != 0x55 || buf[0x1ff] != 0xaa) {
 		DEBUG("no slice table/MBR (no magic)");
+		rc = EEXIST;
 		return (rc);
 	}
 

Modified: projects/bhyve/sys/boot/userboot/userboot/userboot_disk.c
==============================================================================
--- projects/bhyve/sys/boot/userboot/userboot/userboot_disk.c	Tue Oct  2 04:36:37 2012	(r241120)
+++ projects/bhyve/sys/boot/userboot/userboot/userboot_disk.c	Tue Oct  2 04:41:43 2012	(r241121)
@@ -103,6 +103,7 @@ userdisk_open(struct open_file *f, ...)
 {
 	va_list			ap;
 	struct disk_devdesc	*dev;
+	int			rc;
 
 	va_start(ap, f);
 	dev = va_arg(ap, struct disk_devdesc *);
@@ -111,7 +112,15 @@ userdisk_open(struct open_file *f, ...)
 	if (dev->d_unit < 0 || dev->d_unit >= userboot_disk_maxunit)
 		return (EIO);
 
-	return (disk_open(dev));
+	rc = disk_open(dev);
+
+	/*
+	 * No MBR/GPT - assume a raw disk image
+	 */
+	if (rc)
+		dev->d_offset = 0;
+
+	return (0);
 }
 
 static int