From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH] kexec/noreboot: Don't kexec_crash() if noreboot has been requested. Date: Fri, 7 Sep 2012 14:05:19 +0100 Message-ID: <5049F10F.5010801@citrix.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------010804020906090301080001" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: "xen-devel@lists.xen.org" , Keir Fraser , Jan Beulich List-Id: xen-devel@lists.xenproject.org --------------010804020906090301080001 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit This issue came up when debugging pcpu linked list corruption (patches for that issue to follow). -- Andrew Cooper - Dom0 Kernel Engineer, Citrix XenServer T: +44 (0)1223 225 900, http://www.citrix.com --------------010804020906090301080001 Content-Type: text/x-patch; name="noreboot.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="noreboot.patch" # HG changeset patch # Parent 1126b3079bef37e1bb5a97b90c14a51d4e1c91c3 kexec/noreboot: Don't kexec_crash() if noreboot has been requested. The noreboot option is for debugging, to be able to see the dying output. To that end, continuing and possibly booting into the crash kernel defeats one of the purposes of noreboot. Signed-off-by: Andrew Cooper diff -r 1126b3079bef xen/drivers/char/console.c --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -963,16 +963,15 @@ void panic(const char *fmt, ...) debugger_trap_immediate(); -#ifdef CONFIG_KEXEC - kexec_crash(); -#endif - if ( opt_noreboot ) { machine_halt(); } else { +#ifdef CONFIG_KEXEC + kexec_crash(); +#endif watchdog_disable(); machine_restart(5000); } --------------010804020906090301080001 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --------------010804020906090301080001--