Module Name: src
Committed By: pooka
Date: Fri Jul 24 14:11:11 UTC 2015
Modified Files:
src/lib/librumpuser: rumpuser.c
src/sys/rump/librump/rumpkern: emul.c
Log Message:
Since the rump kernel does not know when the container it's running in
actually halts, print "halted" in the hypercall.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/lib/librumpuser/rumpuser.c
cvs rdiff -u -r1.171 -r1.172 src/sys/rump/librump/rumpkern/emul.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpuser.c
diff -u src/lib/librumpuser/rumpuser.c:1.64 src/lib/librumpuser/rumpuser.c:1.65
--- src/lib/librumpuser/rumpuser.c:1.64 Wed Nov 5 00:43:55 2014
+++ src/lib/librumpuser/rumpuser.c Fri Jul 24 14:11:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.c,v 1.64 2014/11/05 00:43:55 pooka Exp $ */
+/* $NetBSD: rumpuser.c,v 1.65 2015/07/24 14:11:11 pooka Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#include "rumpuser_port.h"
#if !defined(lint)
-__RCSID("$NetBSD: rumpuser.c,v 1.64 2014/11/05 00:43:55 pooka Exp $");
+__RCSID("$NetBSD: rumpuser.c,v 1.65 2015/07/24 14:11:11 pooka Exp $");
#endif /* !lint */
#include <sys/stat.h>
@@ -232,6 +232,7 @@ __dead void
rumpuser_exit(int rv)
{
+ fprintf(stderr, "halted\n");
if (rv == RUMPUSER_PANIC)
abort();
else
Index: src/sys/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.171 src/sys/rump/librump/rumpkern/emul.c:1.172
--- src/sys/rump/librump/rumpkern/emul.c:1.171 Wed Apr 22 16:49:42 2015
+++ src/sys/rump/librump/rumpkern/emul.c Fri Jul 24 14:11:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.171 2015/04/22 16:49:42 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.172 2015/07/24 14:11:11 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.171 2015/04/22 16:49:42 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.172 2015/07/24 14:11:11 pooka Exp $");
#include <sys/param.h>
#include <sys/null.h>
@@ -380,7 +380,7 @@ cpu_reboot(int howto, char *bootstr)
/* your wish is my command */
if (howto & RB_HALT) {
- printf("rump kernel halted\n");
+ printf("rump kernel halted (with RB_HALT, not exiting)\n");
rump_sysproxy_fini(finiarg);
for (;;) {
rumpuser_clock_sleep(RUMPUSER_CLOCK_RELWALL, 10, 0);
@@ -389,7 +389,6 @@ cpu_reboot(int howto, char *bootstr)
/* this function is __dead, we must exit */
out:
- printf("halted\n");
rump_sysproxy_fini(finiarg);
rumpuser_exit(ruhow);
}
