Date: Mon, 13 Sep 2010 08:34:20 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r212544 - head/sys/kern Message-ID: <201009130834.o8D8YKTr079016@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Mon Sep 13 08:34:20 2010 New Revision: 212544 URL: http://svn.freebsd.org/changeset/base/212544 Log: bus_add_child: add specialized default implementation that calls panic If a kobj method doesn't have any explicitly provided default implementation, then it is auto-assigned kobj_error_method. kobj_error_method is proper only for methods that return error code, because it just returns ENXIO. So, in the case of unimplemented bus_add_child caller would get (device_t)ENXIO as a return value, which would cause the mistake to go unnoticed, because return value is typically checked for NULL. Thus, a specialized null_add_child is added. It would have sufficied for correctness to return NULL, but this type of mistake was deemed to be rare and serious enough to call panic instead. Watch out for this kind of problem with other kobj methods. Suggested by: jhb, imp MFC after: 2 weeks Modified: head/sys/kern/bus_if.m Modified: head/sys/kern/bus_if.m ============================================================================== --- head/sys/kern/bus_if.m Mon Sep 13 07:29:02 2010 (r212543) +++ head/sys/kern/bus_if.m Mon Sep 13 08:34:20 2010 (r212544) @@ -26,6 +26,8 @@ # $FreeBSD$ # +#include <sys/types.h> +#include <sys/systm.h> #include <sys/bus.h> /** @@ -56,6 +58,14 @@ CODE { return (BUS_REMAP_INTR(dev, NULL, irq)); return (ENXIO); } + + static device_t + null_add_child(device_t bus, int order, const char *name, + int unit) + { + + panic("bus_add_child is not implemented"); + } }; /** @@ -203,7 +213,7 @@ METHOD device_t add_child { u_int _order; const char *_name; int _unit; -}; +} DEFAULT null_add_child; /** * @brief Allocate a system resource
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009130834.o8D8YKTr079016>