Module Name: src
Committed By: pooka
Date: Sun Dec 12 13:18:07 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern: rump.c
Log Message:
print a bit more diagnostics when halting
To generate a diff of this commit:
cvs rdiff -u -r1.208 -r1.209 src/sys/rump/librump/rumpkern/rump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.208 src/sys/rump/librump/rumpkern/rump.c:1.209
--- src/sys/rump/librump/rumpkern/rump.c:1.208 Wed Dec 1 14:59:38 2010
+++ src/sys/rump/librump/rumpkern/rump.c Sun Dec 12 13:18:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.208 2010/12/01 14:59:38 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.209 2010/12/12 13:18:07 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.208 2010/12/01 14:59:38 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.209 2010/12/12 13:18:07 pooka Exp $");
#include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE
@@ -452,11 +452,14 @@
void
cpu_reboot(int howto, char *bootstr)
{
+ int ruhow = 0;
+
+ printf("rump kernel halting...\n");
/* dump means we really take the dive here */
if ((howto & RB_DUMP) || panicstr) {
- rumpuser_exit(RUMPUSER_PANIC);
- /*NOTREACHED*/
+ ruhow = RUMPUSER_PANIC;
+ goto out;
}
/* try to sync */
@@ -476,7 +479,9 @@
}
/* this function is __dead, we must exit */
- rumpuser_exit(0);
+ out:
+ printf("halted\n");
+ rumpuser_exit(ruhow);
}
struct uio *
