Date: Mon, 25 May 2015 09:47:17 +0000 (UTC) From: Roger Pau Monné <royger@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r283516 - head/sys/x86/xen Message-ID: <201505250947.t4P9lHae018779@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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."); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505250947.t4P9lHae018779>