Module Name: src
Committed By: pooka
Date: Tue Apr 30 13:54:54 UTC 2013
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Added Files:
src/sys/rump/librump/rumpkern: hyperstubs.c
Log Message:
weak stubs for optional hypercalls
To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpkern/hyperstubs.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/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.125 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.126
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.125 Sat Apr 27 15:34:53 2013
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Tue Apr 30 13:54:53 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.125 2013/04/27 15:34:53 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.126 2013/04/30 13:54:53 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -21,7 +21,8 @@ LIB= rump
#
SRCS+= rump.c rumpcopy.c emul.c intr.c lwproc.c klock.c \
kobj_rename.c ltsleep.c scheduler.c \
- signals.c sleepq.c threads.c vm.c cprng_stub.c
+ signals.c sleepq.c threads.c vm.c cprng_stub.c \
+ hyperstubs.c
# Multiprocessor or uniprocessor locking. TODO: select right
# locking at runtime.
Added files:
Index: src/sys/rump/librump/rumpkern/hyperstubs.c
diff -u /dev/null src/sys/rump/librump/rumpkern/hyperstubs.c:1.1
--- /dev/null Tue Apr 30 13:54:54 2013
+++ src/sys/rump/librump/rumpkern/hyperstubs.c Tue Apr 30 13:54:53 2013
@@ -0,0 +1,61 @@
+/* $NetBSD: hyperstubs.c,v 1.1 2013/04/30 13:54:53 pooka Exp $ */
+
+/*
+ * Copyright (c) 2013 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: hyperstubs.c,v 1.1 2013/04/30 13:54:53 pooka Exp $");
+
+#include <sys/errno.h>
+
+/* provide weak aliases for optional rump kernel hypervisor features */
+
+int rump_hypernotsupp(void);
+int rump_hypernotsupp(void) { return ENOTSUP; }
+
+/* dynlinking */
+
+__weak_alias(rumpuser_dl_bootstrap,rump_hypernotsupp);
+__weak_alias(rumpuser_dl_globalsym,rump_hypernotsupp);
+
+/* race-free daemon creation */
+
+__weak_alias(rumpuser_daemonize_begin,rump_hypernotsupp);
+__weak_alias(rumpuser_daemonize_done,rump_hypernotsupp);
+
+/* process env */
+
+__weak_alias(rumpuser_kill,rump_hypernotsupp);
+
+/* syscall proxy */
+
+__weak_alias(rumpuser_sp_init,rump_hypernotsupp);
+__weak_alias(rumpuser_sp_copyin,rump_hypernotsupp);
+__weak_alias(rumpuser_sp_copyinstr,rump_hypernotsupp);
+__weak_alias(rumpuser_sp_copyout,rump_hypernotsupp);
+__weak_alias(rumpuser_sp_copyoutstr,rump_hypernotsupp);
+__weak_alias(rumpuser_sp_anonmmap,rump_hypernotsupp);
+__weak_alias(rumpuser_sp_raise,rump_hypernotsupp);
+__weak_alias(rumpuser_sp_fini,rump_hypernotsupp);
