From owner-svn-src-all@FreeBSD.ORG Tue Dec 3 23:25:40 2013 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id F2AA449E; Tue, 3 Dec 2013 23:25:39 +0000 (UTC) Received: from mail.egr.msu.edu (boomhauer.egr.msu.edu [35.9.37.167]) by mx1.freebsd.org (Postfix) with ESMTP id C2B5F1B1C; Tue, 3 Dec 2013 23:25:39 +0000 (UTC) Received: from boomhauer (localhost [127.0.0.1]) by mail.egr.msu.edu (Postfix) with ESMTP id 7C1641BC5; Tue, 3 Dec 2013 18:18:20 -0500 (EST) X-Virus-Scanned: amavisd-new at egr.msu.edu Received: from mail.egr.msu.edu ([127.0.0.1]) by boomhauer (boomhauer.egr.msu.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N6MCVXpCohEI; Tue, 3 Dec 2013 18:18:20 -0500 (EST) Received: from daemon.localdomain (daemon.egr.msu.edu [35.9.44.65]) by mail.egr.msu.edu (Postfix) with ESMTP id 53BE91BC0; Tue, 3 Dec 2013 18:18:20 -0500 (EST) Received: by daemon.localdomain (Postfix, from userid 21281) id 4F2B63412F; Tue, 3 Dec 2013 18:18:20 -0500 (EST) Date: Tue, 3 Dec 2013 18:18:20 -0500 From: Adam McDougall To: "Justin T. Gibbs" , royger@FreeBSD.org Subject: Re: svn commit: r257876 - head/sys/dev/xen/control Message-ID: <20131203231820.GH5386@egr.msu.edu> References: <201311090307.rA937nP7076076@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <201311090307.rA937nP7076076@svn.freebsd.org> User-Agent: Mutt/1.5.22 (2013-10-16) Cc: svn-src-all@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Dec 2013 23:25:40 -0000 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"