From owner-svn-src-projects@FreeBSD.ORG  Thu Jun 21 16:21:32 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 2794A1065673;
	Thu, 21 Jun 2012 16:21:32 +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 EC6558FC0C;
	Thu, 21 Jun 2012 16:21:31 +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 q5LGLVVk023579;
	Thu, 21 Jun 2012 16:21:31 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5LGLVGU023575;
	Thu, 21 Jun 2012 16:21:31 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201206211621.q5LGLVGU023575@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Thu, 21 Jun 2012 16:21:31 +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: r237403 - in projects/amd64_xen_pv/sys:
	amd64/include/xen amd64/xen kern
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 21 Jun 2012 16:21:32 -0000

Author: attilio
Date: Thu Jun 21 16:21:31 2012
New Revision: 237403
URL: http://svn.freebsd.org/changeset/base/237403

Log:
  Until console is not working, redirect the output of panic on the
  emergency console.
  This is a bit hackish as it uses an MD interface on MI directly, but this
  code is thought to be removed soon anyway.
  
  Reviewed by:	cherry

Modified:
  projects/amd64_xen_pv/sys/amd64/include/xen/xen-os.h
  projects/amd64_xen_pv/sys/amd64/xen/machdep.c
  projects/amd64_xen_pv/sys/kern/kern_shutdown.c

Modified: projects/amd64_xen_pv/sys/amd64/include/xen/xen-os.h
==============================================================================
--- projects/amd64_xen_pv/sys/amd64/include/xen/xen-os.h	Thu Jun 21 15:47:06 2012	(r237402)
+++ projects/amd64_xen_pv/sys/amd64/include/xen/xen-os.h	Thu Jun 21 16:21:31 2012	(r237403)
@@ -75,6 +75,7 @@ void bootmem_free(void *ptr, unsigned in
 #include <sys/types.h>
 
 void printk(const char *fmt, ...);
+void vprintk(const char *fmt, __va_list ap);
 
 /* some function prototypes */
 void trap_init(void);

Modified: projects/amd64_xen_pv/sys/amd64/xen/machdep.c
==============================================================================
--- projects/amd64_xen_pv/sys/amd64/xen/machdep.c	Thu Jun 21 15:47:06 2012	(r237402)
+++ projects/amd64_xen_pv/sys/amd64/xen/machdep.c	Thu Jun 21 16:21:31 2012	(r237403)
@@ -1037,12 +1037,19 @@ void
 printk(const char *fmt, ...)
 {
         __va_list ap;
+
+        va_start(ap, fmt);
+	vprintk(fmt, ap);
+        va_end(ap);
+}
+
+void
+vprintk(const char *fmt, __va_list ap)
+{
         int retval;
         static char buf[PRINTK_BUFSIZE];
 
-        va_start(ap, fmt);
         retval = vsnprintf(buf, PRINTK_BUFSIZE - 1, fmt, ap);
-        va_end(ap);
         buf[retval] = 0;
         (void)HYPERVISOR_console_write(buf, retval);
 }

Modified: projects/amd64_xen_pv/sys/kern/kern_shutdown.c
==============================================================================
--- projects/amd64_xen_pv/sys/kern/kern_shutdown.c	Thu Jun 21 15:47:06 2012	(r237402)
+++ projects/amd64_xen_pv/sys/kern/kern_shutdown.c	Thu Jun 21 16:21:31 2012	(r237403)
@@ -616,10 +616,18 @@ 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