[src/trunk]: src/sys/rump/dev Add vnd support to rump

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

details:   https://anonhg.NetBSD.org/src/rev/e797f1b835a6
branches:  trunk
changeset: 330658:e797f1b835a6
user:      prlw1 <prlw1%NetBSD.org@localhost>
date:      Thu Jul 17 08:16:12 2014 +0000

description:
Add vnd support to rump

diffstat:

 sys/rump/dev/Makefile.rumpdevcomp       |   4 +-
 sys/rump/dev/lib/libvnd/Makefile        |  15 ++++++++
 sys/rump/dev/lib/libvnd/shlib_version   |   4 ++
 sys/rump/dev/lib/libvnd/vnd_component.c |  59 +++++++++++++++++++++++++++++++++
 4 files changed, 80 insertions(+), 2 deletions(-)

diffs (104 lines):

diff -r 046f2b08b20c -r e797f1b835a6 sys/rump/dev/Makefile.rumpdevcomp
--- a/sys/rump/dev/Makefile.rumpdevcomp Thu Jul 17 07:17:03 2014 +0000
+++ b/sys/rump/dev/Makefile.rumpdevcomp Thu Jul 17 08:16:12 2014 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile.rumpdevcomp,v 1.11 2014/04/24 21:46:44 pooka Exp $
+#      $NetBSD: Makefile.rumpdevcomp,v 1.12 2014/07/17 08:16:12 prlw1 Exp $
 #
 
 RUMPDEVCOMP=   audio bpf cgd disk dm drvctl fss md netsmb pad pud      \
-               putter raidframe rnd scsipi sysmon wscons               \
+               putter raidframe rnd scsipi sysmon vnd wscons           \
                opencrypto
 
 RUMPUSBDEVS=   ubt ucom ugenhc ulpt umass usb
diff -r 046f2b08b20c -r e797f1b835a6 sys/rump/dev/lib/libvnd/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libvnd/Makefile  Thu Jul 17 08:16:12 2014 +0000
@@ -0,0 +1,15 @@
+#      $NetBSD: Makefile,v 1.1 2014/07/17 08:16:12 prlw1 Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../dev
+
+LIB=   rumpdev_vnd
+
+SRCS=   vnd.c
+
+SRCS+= vnd_component.c
+
+CPPFLAGS+=     -I${RUMPTOP}/librump/rumpvfs
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
diff -r 046f2b08b20c -r e797f1b835a6 sys/rump/dev/lib/libvnd/shlib_version
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libvnd/shlib_version     Thu Jul 17 08:16:12 2014 +0000
@@ -0,0 +1,4 @@
+#      $NetBSD: shlib_version,v 1.1 2014/07/17 08:16:12 prlw1 Exp $
+#
+major=0
+minor=0
diff -r 046f2b08b20c -r e797f1b835a6 sys/rump/dev/lib/libvnd/vnd_component.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libvnd/vnd_component.c   Thu Jul 17 08:16:12 2014 +0000
@@ -0,0 +1,59 @@
+/*     $NetBSD: vnd_component.c,v 1.1 2014/07/17 08:16:12 prlw1 Exp $  */
+
+/*
+ * Copyright (c) 2009 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: vnd_component.c,v 1.1 2014/07/17 08:16:12 prlw1 Exp $");
+
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/stat.h>
+
+#include "rump_private.h"
+#include "rump_vfs_private.h"
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+       extern const struct bdevsw vnd_bdevsw;
+       extern const struct cdevsw vnd_cdevsw;
+       devmajor_t bmaj, cmaj;
+       int error;
+
+       /* go, mydevfs */
+       bmaj = cmaj = -1;
+
+       if ((error = devsw_attach("/dev/vnd0", &vnd_bdevsw, &bmaj,
+           &vnd_cdevsw, &cmaj)) != 0)
+               panic("cannot attach vnd: %d", error);
+
+       if ((error = rump_vfs_makedevnodes(S_IFBLK, "/dev/vnd0", 'a',
+           bmaj, 0, 7)) != 0)
+               panic("cannot create cooked vnd dev nodes: %d", error);
+       if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/rvnd0", 'a',
+           cmaj, 0, 7)) != 0)
+               panic("cannot create raw vnd dev nodes: %d", error);
+}