Date: Wed, 31 Oct 2012 21:05:18 +0000 (UTC) From: "Cherry G. Mathew" <cherry@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r242410 - in projects/amd64_xen_pv/sys: dev/xen/console kern Message-ID: <201210312105.q9VL5IXV030681@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cherry Date: Wed Oct 31 21:05:18 2012 New Revision: 242410 URL: http://svn.freebsd.org/changeset/base/242410 Log: Move debug printing to console to the console driver. This should go away or become a compile time option eventually. Approved by: gibbs (implicit) Modified: projects/amd64_xen_pv/sys/dev/xen/console/console.c projects/amd64_xen_pv/sys/kern/subr_prf.c Modified: projects/amd64_xen_pv/sys/dev/xen/console/console.c ============================================================================== --- projects/amd64_xen_pv/sys/dev/xen/console/console.c Wed Oct 31 21:04:23 2012 (r242409) +++ projects/amd64_xen_pv/sys/dev/xen/console/console.c Wed Oct 31 21:05:18 2012 (r242410) @@ -315,6 +315,10 @@ __xencons_tx_flush(void) HYPERVISOR_console_io(CONSOLEIO_write, sz, &wbuf[WBUF_MASK(wc)]); wc += sz; } else { +#define remove_after_debug +#ifdef remove_after_debug + HYPERVISOR_console_io(CONSOLEIO_write, sz, &wbuf[WBUF_MASK(wc)]); +#endif sent = xencons_ring_send(&wbuf[WBUF_MASK(wc)], sz); if (sent == 0) break; Modified: projects/amd64_xen_pv/sys/kern/subr_prf.c ============================================================================== --- projects/amd64_xen_pv/sys/kern/subr_prf.c Wed Oct 31 21:04:23 2012 (r242409) +++ projects/amd64_xen_pv/sys/kern/subr_prf.c Wed Oct 31 21:05:18 2012 (r242410) @@ -391,10 +391,6 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210312105.q9VL5IXV030681>