Date: Mon, 20 Jun 2011 01:43:19 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r223316 - head/sys/powerpc/ps3 Message-ID: <201106200143.p5K1hJ0d018117@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106200143.p5K1hJ0d018117>