CVS commit: src/sys/rump/librump/rumpkern

[Antti Kantee]

Module Name:    src
Committed By:   pooka
Date:           Wed Jan 29 18:42:14 UTC 2014

Modified Files:
        src/sys/rump/librump/rumpkern: emul.c rump.c

Log Message:
lwp0 needs l_proc set for panic->cpu_reboot to dump core the right way


To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.283 -r1.284 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/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.161 src/sys/rump/librump/rumpkern/emul.c:1.162
--- src/sys/rump/librump/rumpkern/emul.c:1.161	Fri Jan 17 01:32:53 2014
+++ src/sys/rump/librump/rumpkern/emul.c	Wed Jan 29 18:42:14 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: emul.c,v 1.161 2014/01/17 01:32:53 pooka Exp $	*/
+/*	$NetBSD: emul.c,v 1.162 2014/01/29 18:42:14 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.161 2014/01/17 01:32:53 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.162 2014/01/29 18:42:14 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/null.h>
@@ -40,6 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.1
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/file.h>
+#include <sys/filedesc.h>
 #include <sys/cpu.h>
 #include <sys/kmem.h>
 #include <sys/poll.h>
@@ -73,7 +74,11 @@ int physmem = PHYSMEM;
 int nkmempages = PHYSMEM/2; /* from le chapeau */
 #undef PHYSMEM
 
-struct lwp lwp0;
+struct lwp lwp0 = {
+	.l_lid = 1,
+	.l_proc = &proc0,
+	.l_fd = &filedesc0,
+};
 struct vnode *rootvp;
 dev_t rootdev = NODEV;
 

Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.283 src/sys/rump/librump/rumpkern/rump.c:1.284
--- src/sys/rump/librump/rumpkern/rump.c:1.283	Fri Jan 17 02:05:54 2014
+++ src/sys/rump/librump/rumpkern/rump.c	Wed Jan 29 18:42:14 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.c,v 1.283 2014/01/17 02:05:54 pooka Exp $	*/
+/*	$NetBSD: rump.c,v 1.284 2014/01/29 18:42:14 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.283 2014/01/17 02:05:54 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.284 2014/01/29 18:42:14 pooka Exp $");
 
 #include <sys/systm.h>
 #define ELFSIZE ARCH_ELFSIZE
@@ -271,9 +271,7 @@ rump_init(void)
 
 	/* init minimal lwp/cpu context */
 	l = &lwp0;
-	l->l_lid = 1;
 	l->l_cpu = l->l_target_cpu = rump_cpu;
-	l->l_fd = &filedesc0;
 
 	/* lwp0 isn't created like other threads, so notify hypervisor here */
 	rumpuser_curlwpop(RUMPUSER_LWP_CREATE, l);