From owner-svn-src-all@FreeBSD.ORG  Mon May 25 09:47:17 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7C0177DD;
 Mon, 25 May 2015 09:47:17 +0000 (UTC)
 (envelope-from royger@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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 69A41F9F;
 Mon, 25 May 2015 09:47:17 +0000 (UTC)
 (envelope-from royger@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4P9lHZ5018780;
 Mon, 25 May 2015 09:47:17 GMT (envelope-from royger@FreeBSD.org)
Received: (from royger@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4P9lHae018779;
 Mon, 25 May 2015 09:47:17 GMT (envelope-from royger@FreeBSD.org)
Message-Id: <201505250947.t4P9lHae018779@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: royger set sender to
 royger@FreeBSD.org using -f
From: Roger Pau Monné <royger@FreeBSD.org>
Date: Mon, 25 May 2015 09:47:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r283516 - head/sys/x86/xen
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
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/options/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, 25 May 2015 09:47:17 -0000

Author: royger
Date: Mon May 25 09:47:16 2015
New Revision: 283516
URL: https://svnweb.freebsd.org/changeset/base/283516

Log:
  xen: make sure xenpv bus is the last to attach
  
  This is needed so other buses have a chance of attaching a real ISA bus, if
  none is found xenpv will attach it.
  
  Sponsored by: Citrix Systems R&D

Modified:
  head/sys/x86/xen/xenpv.c

Modified: head/sys/x86/xen/xenpv.c
==============================================================================
--- head/sys/x86/xen/xenpv.c	Mon May 25 09:08:19 2015	(r283515)
+++ head/sys/x86/xen/xenpv.c	Mon May 25 09:47:16 2015	(r283516)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/pcpu.h>
 #include <sys/rman.h>
 #include <sys/smp.h>
+#include <sys/limits.h>
 
 #include <vm/vm.h>
 #include <vm/vm_page.h>
@@ -72,7 +73,11 @@ xenpv_identify(driver_t *driver, device_
 	if (devclass_get_device(xenpv_devclass, 0))
 		return;
 
-	if (BUS_ADD_CHILD(parent, 0, "xenpv", 0) == NULL)
+	/*
+	 * The xenpv bus should be the last to attach in order
+	 * to properly detect if an ISA bus has already been added.
+	 */
+	if (BUS_ADD_CHILD(parent, UINT_MAX, "xenpv", 0) == NULL)
 		panic("Unable to attach xenpv bus.");
 }