From owner-svn-src-projects@FreeBSD.ORG  Wed Oct 31 21:05:18 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E51D2590;
 Wed, 31 Oct 2012 21:05:18 +0000 (UTC)
 (envelope-from cherry@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id CB9698FC08;
 Wed, 31 Oct 2012 21:05:18 +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 q9VL5IFb030684;
 Wed, 31 Oct 2012 21:05:18 GMT (envelope-from cherry@svn.freebsd.org)
Received: (from cherry@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9VL5IXV030681;
 Wed, 31 Oct 2012 21:05:18 GMT (envelope-from cherry@svn.freebsd.org)
Message-Id: <201210312105.q9VL5IXV030681@svn.freebsd.org>
From: "Cherry G. Mathew" <cherry@FreeBSD.org>
Date: Wed, 31 Oct 2012 21:05:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r242410 - in projects/amd64_xen_pv/sys: dev/xen/console
 kern
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Oct 2012 21:05:19 -0000

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