Module Name: src
Committed By: bouyer
Date: Sat Apr 25 15:42:15 UTC 2020
Modified Files:
src/sys/rump: listsrcdirs
src/sys/rump/dev/lib/libumass: Makefile
src/sys/rump/fs/lib/libffs: Makefile
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: lwproc.c rump.c rump_syscalls.c sleepq.c
src/sys/rump/librump/rumpvfs: rump_vfs.c rumpfs.c
Log Message:
Merge the bouyer-xenpvh branch, bringing in Xen PV drivers support under HVM
guests in GENERIC.
Xen support can be disabled at runtime with
boot -c
disable hypervisor
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/rump/listsrcdirs
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/dev/lib/libumass/Makefile
cvs rdiff -u -r1.18 -r1.19 src/sys/rump/fs/lib/libffs/Makefile
cvs rdiff -u -r1.115 -r1.116 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.47 -r1.48 src/sys/rump/librump/rumpkern/lwproc.c
cvs rdiff -u -r1.345 -r1.346 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.146 -r1.147 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.19 -r1.20 src/sys/rump/librump/rumpkern/sleepq.c
cvs rdiff -u -r1.92 -r1.93 src/sys/rump/librump/rumpvfs/rump_vfs.c
cvs rdiff -u -r1.157 -r1.158 src/sys/rump/librump/rumpvfs/rumpfs.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/listsrcdirs
diff -u src/sys/rump/listsrcdirs:1.49 src/sys/rump/listsrcdirs:1.50
--- src/sys/rump/listsrcdirs:1.49 Fri Sep 27 11:57:42 2019
+++ src/sys/rump/listsrcdirs Sat Apr 25 15:42:14 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: listsrcdirs,v 1.49 2019/09/27 11:57:42 bad Exp $
+# $NetBSD: listsrcdirs,v 1.50 2020/04/25 15:42:14 bouyer Exp $
#
#
@@ -78,7 +78,7 @@ include_headerlist ()
fi
}
-ARCHS="amd64 i386 x86 arm evbarm sparc sparc64 powerpc evbppc mips evbmips aarch64 riscv"
+ARCHS="amd64 i386 x86 xen arm evbarm sparc sparc64 powerpc evbppc mips evbmips aarch64 riscv"
ARCHS_EXTRA="arm/arm32 Makefile"
# files listed in src/tools/Makefile.nbincludes
ARCHS_EXTRA="$ARCHS_EXTRA ews4800mips/include/pdinfo.h
Index: src/sys/rump/dev/lib/libumass/Makefile
diff -u src/sys/rump/dev/lib/libumass/Makefile:1.11 src/sys/rump/dev/lib/libumass/Makefile:1.12
--- src/sys/rump/dev/lib/libumass/Makefile:1.11 Mon Apr 13 11:27:22 2020
+++ src/sys/rump/dev/lib/libumass/Makefile Sat Apr 25 15:42:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/04/13 11:27:22 jdolecek Exp $
+# $NetBSD: Makefile,v 1.12 2020/04/25 15:42:14 bouyer Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb
Index: src/sys/rump/fs/lib/libffs/Makefile
diff -u src/sys/rump/fs/lib/libffs/Makefile:1.18 src/sys/rump/fs/lib/libffs/Makefile:1.19
--- src/sys/rump/fs/lib/libffs/Makefile:1.18 Sat Apr 18 19:18:33 2020
+++ src/sys/rump/fs/lib/libffs/Makefile Sat Apr 25 15:42:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/04/18 19:18:33 christos Exp $
+# $NetBSD: Makefile,v 1.19 2020/04/25 15:42:15 bouyer Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/ffs ${.CURDIR}/../../../../ufs/ufs
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.115 src/sys/rump/include/rump/rump_syscalls.h:1.116
--- src/sys/rump/include/rump/rump_syscalls.h:1.115 Wed Apr 22 21:25:17 2020
+++ src/sys/rump/include/rump/rump_syscalls.h Sat Apr 25 15:42:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_syscalls.h,v 1.115 2020/04/22 21:25:17 thorpej Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.116 2020/04/25 15:42:15 bouyer Exp $ */
/*
* System call protos in rump namespace.
Index: src/sys/rump/librump/rumpkern/lwproc.c
diff -u src/sys/rump/librump/rumpkern/lwproc.c:1.47 src/sys/rump/librump/rumpkern/lwproc.c:1.48
--- src/sys/rump/librump/rumpkern/lwproc.c:1.47 Fri Apr 24 13:34:47 2020
+++ src/sys/rump/librump/rumpkern/lwproc.c Sat Apr 25 15:42:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lwproc.c,v 1.47 2020/04/24 13:34:47 thorpej Exp $ */
+/* $NetBSD: lwproc.c,v 1.48 2020/04/25 15:42:15 bouyer Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#define RUMP__CURLWP_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.47 2020/04/24 13:34:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.48 2020/04/25 15:42:15 bouyer Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.345 src/sys/rump/librump/rumpkern/rump.c:1.346
--- src/sys/rump/librump/rumpkern/rump.c:1.345 Thu Apr 23 00:34:29 2020
+++ src/sys/rump/librump/rumpkern/rump.c Sat Apr 25 15:42:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.345 2020/04/23 00:34:29 joerg Exp $ */
+/* $NetBSD: rump.c,v 1.346 2020/04/25 15:42:15 bouyer 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.345 2020/04/23 00:34:29 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.346 2020/04/25 15:42:15 bouyer Exp $");
#include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.146 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.147
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.146 Wed Apr 22 21:25:17 2020
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Sat Apr 25 15:42:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_syscalls.c,v 1.146 2020/04/22 21:25:17 thorpej Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.147 2020/04/25 15:42:15 bouyer Exp $ */
/*
* System call vector and marshalling for rump.
@@ -15,7 +15,7 @@
#ifdef __NetBSD__
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.146 2020/04/22 21:25:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.147 2020/04/25 15:42:15 bouyer Exp $");
#include <sys/fstypes.h>
#include <sys/proc.h>
Index: src/sys/rump/librump/rumpkern/sleepq.c
diff -u src/sys/rump/librump/rumpkern/sleepq.c:1.19 src/sys/rump/librump/rumpkern/sleepq.c:1.20
--- src/sys/rump/librump/rumpkern/sleepq.c:1.19 Sun Apr 19 20:41:30 2020
+++ src/sys/rump/librump/rumpkern/sleepq.c Sat Apr 25 15:42:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sleepq.c,v 1.19 2020/04/19 20:41:30 ad Exp $ */
+/* $NetBSD: sleepq.c,v 1.20 2020/04/25 15:42:15 bouyer Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sleepq.c,v 1.19 2020/04/19 20:41:30 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sleepq.c,v 1.20 2020/04/25 15:42:15 bouyer Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
Index: src/sys/rump/librump/rumpvfs/rump_vfs.c
diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.92 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.93
--- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.92 Mon Apr 20 21:39:05 2020
+++ src/sys/rump/librump/rumpvfs/rump_vfs.c Sat Apr 25 15:42:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_vfs.c,v 1.92 2020/04/20 21:39:05 ad Exp $ */
+/* $NetBSD: rump_vfs.c,v 1.93 2020/04/25 15:42:15 bouyer Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.92 2020/04/20 21:39:05 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.93 2020/04/25 15:42:15 bouyer Exp $");
#include <sys/param.h>
#include <sys/buf.h>
Index: src/sys/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.157 src/sys/rump/librump/rumpvfs/rumpfs.c:1.158
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.157 Thu Apr 23 21:47:08 2020
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Sat Apr 25 15:42:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.157 2020/04/23 21:47:08 ad Exp $ */
+/* $NetBSD: rumpfs.c,v 1.158 2020/04/25 15:42:15 bouyer Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.157 2020/04/23 21:47:08 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.158 2020/04/25 15:42:15 bouyer Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
