From owner-svn-src-all@FreeBSD.ORG Tue Dec 3 23:42:23 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 18D2761A; Tue, 3 Dec 2013 23:42:23 +0000 (UTC) Received: from aslan.scsiguy.com (aslan.scsiguy.com [70.89.174.89]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D31E51D02; Tue, 3 Dec 2013 23:42:22 +0000 (UTC) Received: from [10.85.60.86] (207-225-98-3.dia.static.qwest.net [207.225.98.3]) (authenticated bits=0) by aslan.scsiguy.com (8.14.7/8.14.5) with ESMTP id rB3Ng8qM026379 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Tue, 3 Dec 2013 16:42:12 -0700 (MST) (envelope-from gibbs@FreeBSD.org) Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 7.0 \(1822\)) Subject: Re: svn commit: r257876 - head/sys/dev/xen/control From: "Justin T. Gibbs" In-Reply-To: <20131203231820.GH5386@egr.msu.edu> Date: Tue, 3 Dec 2013 16:42:04 -0700 Content-Transfer-Encoding: quoted-printable Message-Id: <9D8F6047-59FE-4B0A-997F-6390209CFEE6@FreeBSD.org> References: <201311090307.rA937nP7076076@svn.freebsd.org> <20131203231820.GH5386@egr.msu.edu> To: Adam McDougall X-Mailer: Apple Mail (2.1822) X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (aslan.scsiguy.com [70.89.174.89]); Tue, 03 Dec 2013 16:42:12 -0700 (MST) Cc: svn-src-all@freebsd.org, =?windows-1252?Q?Roger_Pau_Monn=E9?= 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:42:23 -0000 A request to merge is currently pending with re@. =97 Justin On Dec 3, 2013, at 4:18 PM, Adam McDougall wrote: > If 're' permits, could this be MFC'ed for 10.0? It isn't important > but it would be convenient. Thanks. >=20 > On Sat, Nov 09, 2013 at 03:07:49AM +0000, Justin T. Gibbs wrote: >=20 > Author: gibbs > Date: Sat Nov 9 03:07:48 2013 > New Revision: 257876 > URL: http://svnweb.freebsd.org/changeset/base/257876 >=20 > 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". >=20 > NB: The "halt" signal seems to be used on XenServer only. The OSS > Xen toolstack (xl) uses "poweroff" instead. >=20 > Submitted by: Roger Pau Monn=E9 > Sponsored by: Citrix Systems R&D > Reviewed by: gibbs > MFC after: 2 days >=20 > Modified: > head/sys/dev/xen/control/control.c >=20 > Modified: head/sys/dev/xen/control/control.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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; >=20 > /*-------------------------- 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 }, > }; >=20 > struct xctrl_softc { > @@ -441,12 +440,6 @@ xctrl_crash() > panic("Xen directed crash"); > } >=20 > -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" >=20