Move rumpuser stub calls from core lib to rumpuser lib

That's where they should've been in the first place, except
that the rumpuser lib didn't exist back then.

diff --git a/lib/librumprun_core/Makefile b/lib/librumprun_core/Makefile
index aa3b1390d6d8c6a505531322adb7e6a4c2891a46..cd8dd23f7a4c700c79463c57df4e4969afc40186 100644 (file)
--- a/lib/librumprun_core/Makefile
+++ b/lib/librumprun_core/Makefile
@@ -3,8 +3,6 @@ LIBISPRIVATE=   # defined
 
 SRCS=          init.c bmk_string.c memalloc.c subr_prf.c
 
-SRCS+=         rumpuser_stubs.c
-
 CPPFLAGS+=     -I${.CURDIR}/../../include
 
 .include "${.CURDIR}/arch/${MACHINE}/Makefile.inc"

diff --git a/lib/librumprun_core/rumpuser_stubs.c b/lib/librumprun_core/rumpuser_stubs.c
deleted file mode 100644 (file)
index f1c64a5..0000000
--- a/lib/librumprun_core/rumpuser_stubs.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 2014 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.
- */
-
-/*
- * Stub implementations for various rump kernel hypercalls that
- * are not supported on these platforms.  This file should go away
- * with the next revision of the rump kernel hypercall interface.
- */
-
-#include <bmk-core/errno.h>
-
-int rumpuser_stub_nothing(void);
-int rumpuser_stub_nothing(void) {return 0;}
-#define NOTHING(name) \
-int name(void) __attribute__((alias("rumpuser_stub_nothing")));
-
-int rumpuser_stub_enosys(void);
-int rumpuser_stub_enosys(void) {return BMK_ENOSYS;}
-#define NOSYS(name) \
-int name(void) __attribute__((alias("rumpuser_stub_enosys")));
-
-NOTHING(rumpuser_dl_bootstrap);
-
-NOSYS(rumpuser_anonmmap);
-NOSYS(rumpuser_unmap);
-
-NOSYS(rumpuser_kill);
-
-NOSYS(rumpuser_daemonize_begin);
-NOSYS(rumpuser_daemonize_done);
-
-NOSYS(rumpuser_iovread);
-NOSYS(rumpuser_iovwrite);

diff --git a/lib/librumprun_rumpuser/Makefile b/lib/librumprun_rumpuser/Makefile
index 58f95eb3dd8ccbecb35a1c7e9bd3bfd3948a9c17..b98348e87dd4b32f984fb7b08e6a1d612e69806c 100644 (file)
--- a/lib/librumprun_rumpuser/Makefile
+++ b/lib/librumprun_rumpuser/Makefile
@@ -6,6 +6,8 @@ SRCS+=          rumpuser_clock.c
 SRCS+=         rumpuser_mem.c
 SRCS+=         rumpuser_synch.c
 
+SRCS+=         rumpuser_stubs.c
+
 CPPFLAGS+=     -I${.CURDIR}/../../include
 
 .include <bsd.lib.mk>

diff --git a/lib/librumprun_rumpuser/rumpuser_stubs.c b/lib/librumprun_rumpuser/rumpuser_stubs.c
new file mode 100644 (file)
index 0000000..f1c64a5
--- /dev/null
+++ b/lib/librumprun_rumpuser/rumpuser_stubs.c
@@ -0,0 +1,55 @@
+/*-
+ * Copyright (c) 2014 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.
+ */
+
+/*
+ * Stub implementations for various rump kernel hypercalls that
+ * are not supported on these platforms.  This file should go away
+ * with the next revision of the rump kernel hypercall interface.
+ */
+
+#include <bmk-core/errno.h>
+
+int rumpuser_stub_nothing(void);
+int rumpuser_stub_nothing(void) {return 0;}
+#define NOTHING(name) \
+int name(void) __attribute__((alias("rumpuser_stub_nothing")));
+
+int rumpuser_stub_enosys(void);
+int rumpuser_stub_enosys(void) {return BMK_ENOSYS;}
+#define NOSYS(name) \
+int name(void) __attribute__((alias("rumpuser_stub_enosys")));
+
+NOTHING(rumpuser_dl_bootstrap);
+
+NOSYS(rumpuser_anonmmap);
+NOSYS(rumpuser_unmap);
+
+NOSYS(rumpuser_kill);
+
+NOSYS(rumpuser_daemonize_begin);
+NOSYS(rumpuser_daemonize_done);
+
+NOSYS(rumpuser_iovread);
+NOSYS(rumpuser_iovwrite);