From owner-p4-projects@FreeBSD.ORG  Wed Jan  4 05:58:48 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DA76E16A42C; Wed,  4 Jan 2006 05:58:47 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 99A7916A42F
	for <perforce@freebsd.org>; Wed,  4 Jan 2006 05:58:47 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6342143D4C
	for <perforce@freebsd.org>; Wed,  4 Jan 2006 05:58:47 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k045wlHc066218
	for <perforce@freebsd.org>; Wed, 4 Jan 2006 05:58:47 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k045wlFT066213
	for perforce@freebsd.org; Wed, 4 Jan 2006 05:58:47 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 4 Jan 2006 05:58:47 GMT
Message-Id: <200601040558.k045wlFT066213@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 89126 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jan 2006 05:58:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=89126

Change 89126 by kmacy@kmacy:freebsd7_xen3 on 2006/01/04 05:58:44

	fix shutdown, we now shutdown and reboot cleanly	

Affected files ...

.. //depot/projects/xen3/src/sys/i386/i386/vm_machdep.c#3 edit
.. //depot/projects/xen3/src/sys/kern/kern_shutdown.c#2 edit

Differences ...

==== //depot/projects/xen3/src/sys/i386/i386/vm_machdep.c#3 (text+ko) ====

@@ -551,6 +551,11 @@
 	}
 #endif
 
+#ifdef XEN
+	HYPERVISOR_sched_op(SCHEDOP_shutdown, SHUTDOWN_reboot);
+#endif
+
+
 #ifdef SMP
 	u_int cnt, map;
 

==== //depot/projects/xen3/src/sys/kern/kern_shutdown.c#2 (text+ko) ====

@@ -418,6 +418,9 @@
 		printf("Please press any key to reboot.\n\n");
 		switch (cngetc()) {
 		case -1:		/* No console, just die */
+#ifdef XEN
+		case 0:                 /* No valid input */
+#endif
 			cpu_halt();
 			/* NOTREACHED */
 		default: