Date: Tue, 3 Dec 2013 18:18:20 -0500 From: Adam McDougall <mcdouga9@egr.msu.edu> To: "Justin T. Gibbs" <gibbs@FreeBSD.org>, royger@FreeBSD.org Cc: svn-src-all@freebsd.org Subject: Re: svn commit: r257876 - head/sys/dev/xen/control Message-ID: <20131203231820.GH5386@egr.msu.edu> In-Reply-To: <201311090307.rA937nP7076076@svn.freebsd.org> References: <201311090307.rA937nP7076076@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
If 're' permits, could this be MFC'ed for 10.0? It isn't important but it would be convenient. Thanks. On Sat, Nov 09, 2013 at 03:07:49AM +0000, Justin T. Gibbs wrote: Author: gibbs Date: Sat Nov 9 03:07:48 2013 New Revision: 257876 URL: http://svnweb.freebsd.org/changeset/base/257876 Log: On XenServer the "halt" message is used instead of "poweroff", which makes FreeBSD halt but not poweroff (as expected when issuing a shutdown from the VM manager). Fix this by using the same handler for both "halt" and "poweroff". NB: The "halt" signal seems to be used on XenServer only. The OSS Xen toolstack (xl) uses "poweroff" instead. Submitted by: Roger Pau Monné Sponsored by: Citrix Systems R&D Reviewed by: gibbs MFC after: 2 days Modified: head/sys/dev/xen/control/control.c Modified: head/sys/dev/xen/control/control.c ============================================================================== --- head/sys/dev/xen/control/control.c Sat Nov 9 00:59:31 2013 (r257875) +++ head/sys/dev/xen/control/control.c Sat Nov 9 03:07:48 2013 (r257876) @@ -158,7 +158,6 @@ static xctrl_shutdown_handler_t xctrl_po static xctrl_shutdown_handler_t xctrl_reboot; static xctrl_shutdown_handler_t xctrl_suspend; static xctrl_shutdown_handler_t xctrl_crash; -static xctrl_shutdown_handler_t xctrl_halt; /*-------------------------- Private Data Structures -------------------------*/ /** Element type for lookup table of event name to handler. */ @@ -173,7 +172,7 @@ static const struct xctrl_shutdown_reaso { "reboot", xctrl_reboot }, { "suspend", xctrl_suspend }, { "crash", xctrl_crash }, - { "halt", xctrl_halt }, + { "halt", xctrl_poweroff }, }; struct xctrl_softc { @@ -441,12 +440,6 @@ xctrl_crash() panic("Xen directed crash"); } -static void -xctrl_halt() -{ - shutdown_nice(RB_HALT); -} - /*------------------------------ Event Reception -----------------------------*/ static void xctrl_on_watch_event(struct xs_watch *watch, const char **vec, unsigned int len) _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131203231820.GH5386>