From owner-svn-src-projects@FreeBSD.ORG Fri Jun 22 18:18:50 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 50EAA106566B; Fri, 22 Jun 2012 18:18:50 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F3BCB8FC08; Fri, 22 Jun 2012 18:18:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5MIInxJ092997; Fri, 22 Jun 2012 18:18:49 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5MIInv6092993; Fri, 22 Jun 2012 18:18:49 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201206221818.q5MIInv6092993@svn.freebsd.org> From: Attilio Rao Date: Fri, 22 Jun 2012 18:18:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237449 - in projects/amd64_xen_pv/sys: ddb kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jun 2012 18:18:50 -0000 Author: attilio Date: Fri Jun 22 18:18:49 2012 New Revision: 237449 URL: http://svn.freebsd.org/changeset/base/237449 Log: Remove the code for redirecting the panic message on emergency console and use it directly in vprintf() and db_printf(). This will let most of the output to get out when booting FreeBSD and when debugging directly in the emergency console. Modified: projects/amd64_xen_pv/sys/ddb/db_output.c projects/amd64_xen_pv/sys/kern/kern_shutdown.c projects/amd64_xen_pv/sys/kern/subr_prf.c Modified: projects/amd64_xen_pv/sys/ddb/db_output.c ============================================================================== --- projects/amd64_xen_pv/sys/ddb/db_output.c Fri Jun 22 18:01:22 2012 (r237448) +++ projects/amd64_xen_pv/sys/ddb/db_output.c Fri Jun 22 18:18:49 2012 (r237449) @@ -45,6 +45,9 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef XEN +#include +#endif #include #include @@ -337,6 +340,11 @@ db_printf(const char *fmt, ...) #endif va_start(listp, fmt); + +#ifdef XEN + /* Redirect the db_printf() output also to the emergency console. */ + vprintk(fmt, listp); +#endif retval = kvprintf (fmt, db_putchar, &dca, db_radix, listp); va_end(listp); Modified: projects/amd64_xen_pv/sys/kern/kern_shutdown.c ============================================================================== --- projects/amd64_xen_pv/sys/kern/kern_shutdown.c Fri Jun 22 18:01:22 2012 (r237448) +++ projects/amd64_xen_pv/sys/kern/kern_shutdown.c Fri Jun 22 18:18:49 2012 (r237449) @@ -616,18 +616,10 @@ panic(const char *fmt, ...) panicstr = buf; cngrab(); printf("panic: %s\n", buf); -#ifdef XEN - printk("panic: %s\n", buf); -#endif } else { printf("panic: "); vprintf(fmt, ap); printf("\n"); -#ifdef XEN - printk("panic: "); - vprintk(fmt, ap); - printk("\n"); -#endif } va_end(ap); #ifdef SMP Modified: projects/amd64_xen_pv/sys/kern/subr_prf.c ============================================================================== --- projects/amd64_xen_pv/sys/kern/subr_prf.c Fri Jun 22 18:01:22 2012 (r237448) +++ projects/amd64_xen_pv/sys/kern/subr_prf.c Fri Jun 22 18:18:49 2012 (r237449) @@ -68,6 +68,9 @@ __FBSDID("$FreeBSD$"); * ANSI and traditional C compilers. */ #include +#ifdef XEN +#include +#endif #define TOCONS 0x01 #define TOTTY 0x02 @@ -388,6 +391,10 @@ vprintf(const char *fmt, va_list ap) pca.p_bufr = NULL; #endif +#ifdef XEN + /* Redirect the vprintf() output also to the emergency console. */ + vprintk(fmt, ap); +#endif retval = kvprintf(fmt, putchar, &pca, 10, ap); #ifdef PRINTF_BUFR_SIZE