From owner-svn-src-all@FreeBSD.ORG  Mon Jun 20 01:43:19 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4CD001065670;
	Mon, 20 Jun 2011 01:43:19 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3C7338FC08;
	Mon, 20 Jun 2011 01:43:19 +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 p5K1hJtd018119;
	Mon, 20 Jun 2011 01:43:19 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5K1hJ0d018117;
	Mon, 20 Jun 2011 01:43:19 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201106200143.p5K1hJ0d018117@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 20 Jun 2011 01:43:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223316 - head/sys/powerpc/ps3
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 20 Jun 2011 01:43:19 -0000

Author: nwhitehorn
Date: Mon Jun 20 01:43:18 2011
New Revision: 223316
URL: http://svn.freebsd.org/changeset/base/223316

Log:
  Make this slightly less yelly about regions that the hypervisor protects
  from us by not registering them as disks.

Modified:
  head/sys/powerpc/ps3/ps3disk.c

Modified: head/sys/powerpc/ps3/ps3disk.c
==============================================================================
--- head/sys/powerpc/ps3/ps3disk.c	Mon Jun 20 01:43:14 2011	(r223315)
+++ head/sys/powerpc/ps3/ps3disk.c	Mon Jun 20 01:43:18 2011	(r223316)
@@ -274,6 +274,8 @@ ps3disk_attach(device_t dev)
 	}
 
 	for (i = 0; i < sc->sc_nregs; i++) {
+		struct ps3disk_region *rp = &sc->sc_reg[i];
+
 		d = sc->sc_disk[i] = disk_alloc();
 		d->d_open = ps3disk_open;
 		d->d_close = ps3disk_close;
@@ -293,10 +295,16 @@ ps3disk_attach(device_t dev)
 			mb /= 1024;
 		}
 
-		device_printf(dev, "region %d %ju%cB\n", i, mb, unit);
+		/* Test to see if we can read this region */
+		err = lv1_storage_read(ps3bus_get_device(dev), d->d_unit,
+		    0, 1, rp->r_flags, sc->sc_bounce_lpar, &sc->sc_bounce_tag);
+		device_printf(dev, "region %d %ju%cB%s\n", i, mb, unit,
+		     (err == 0) ? "" : " (hypervisor protected)");
 
-		disk_create(d, DISK_VERSION);
+		if (err == 0)
+			disk_create(d, DISK_VERSION);
 	}
+	err = 0;
 
 	bioq_init(&sc->sc_bioq);