[src/trunk]: src Since the rump kernel does not know when the container it's ...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f101c83f4926
branches:  trunk
changeset: 339484:f101c83f4926
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Jul 24 14:11:11 2015 +0000

description:
Since the rump kernel does not know when the container it's running in
actually halts, print "halted" in the hypercall.

diffstat:

 lib/librumpuser/rumpuser.c       |  5 +++--
 sys/rump/librump/rumpkern/emul.c |  7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (61 lines):

diff -r f176deba2908 -r f101c83f4926 lib/librumpuser/rumpuser.c
--- a/lib/librumpuser/rumpuser.c        Fri Jul 24 13:02:52 2015 +0000
+++ b/lib/librumpuser/rumpuser.c        Fri Jul 24 14:11:11 2015 +0000
@@ -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 @@
 rumpuser_exit(int rv)
 {
 
+       fprintf(stderr, "halted\n");
        if (rv == RUMPUSER_PANIC)
                abort();
        else
diff -r f176deba2908 -r f101c83f4926 sys/rump/librump/rumpkern/emul.c
--- a/sys/rump/librump/rumpkern/emul.c  Fri Jul 24 13:02:52 2015 +0000
+++ b/sys/rump/librump/rumpkern/emul.c  Fri Jul 24 14:11:11 2015 +0000
@@ -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 @@
 
        /* 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 @@
 
        /* this function is __dead, we must exit */
  out:
-       printf("halted\n");
        rump_sysproxy_fini(finiarg);
        rumpuser_exit(ruhow);
 }