From owner-svn-src-head@FreeBSD.ORG  Fri Aug 30 01:46:56 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id D9EE4ADE;
 Fri, 30 Aug 2013 01:46:56 +0000 (UTC)
 (envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C71742992;
 Fri, 30 Aug 2013 01:46:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7U1kufV053856;
 Fri, 30 Aug 2013 01:46:56 GMT
 (envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7U1kun3053855;
 Fri, 30 Aug 2013 01:46:56 GMT
 (envelope-from cperciva@svn.freebsd.org)
Message-Id: <201308300146.r7U1kun3053855@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Fri, 30 Aug 2013 01:46:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255051 - head/sys/dev/xen/blkfront
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Aug 2013 01:46:56 -0000

Author: cperciva
Date: Fri Aug 30 01:46:56 2013
New Revision: 255051
URL: http://svnweb.freebsd.org/changeset/base/255051

Log:
  If reading a virtual-device value fails, attempt to read a virtual-device-ext
  value.  Some hosts do not publish "extended" disk IDs via virtual-device in
  an attempt to avoid confusing old blkfront drivers, and without this change
  we failed to attach such disks.
  
  In particular, this commit allows all 24 ephemeral disks on EC2 hs1.8xlarge
  instances to be used, instead of only the first 15.
  
  MFC after:	3 days

Modified:
  head/sys/dev/xen/blkfront/blkfront.c

Modified: head/sys/dev/xen/blkfront/blkfront.c
==============================================================================
--- head/sys/dev/xen/blkfront/blkfront.c	Fri Aug 30 01:45:36 2013	(r255050)
+++ head/sys/dev/xen/blkfront/blkfront.c	Fri Aug 30 01:46:56 2013	(r255051)
@@ -1409,6 +1409,9 @@ xbd_attach(device_t dev)
 	/* FIXME: Use dynamic device id if this is not set. */
 	error = xs_scanf(XST_NIL, xenbus_get_node(dev),
 	    "virtual-device", NULL, "%" PRIu32, &vdevice);
+	if (error)
+		error = xs_scanf(XST_NIL, xenbus_get_node(dev),
+		    "virtual-device-ext", NULL, "%" PRIu32, &vdevice);
 	if (error) {
 		xenbus_dev_fatal(dev, error, "reading virtual-device");
 		device_printf(dev, "Couldn't determine virtual device.\n");