 @@ -1,14 +1,14 @@
-/*	$NetBSD: rumpuser.h,v 1.19 2009/02/28 15:49:12 pooka Exp $	*/
+/*	$NetBSD: rumpuser.h,v 1.20 2009/03/18 15:32:27 pooka Exp $	*/
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by Google Summer of Code.
+ *
  * 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
 @@ -44,28 +44,33 @@ int rumpuser_getfileinfo(const char *, u
 #define RUMPUSER_FT_REG 2
 #define RUMPUSER_FT_BLK 3
 #define RUMPUSER_FT_OTHER 4
 int rumpuser_nanosleep(uint64_t *, uint64_t *, int *);
 #define rumpuser_malloc(a,b) rumpuser__malloc(a,b,__func__,__LINE__);
 #define rumpuser_realloc(a,b,c) rumpuser__realloc(a,b,c,__func__,__LINE__);
 void *rumpuser__malloc(size_t, int, const char *, int);
 void *rumpuser__realloc(void *, size_t, int, const char *, int);
 void rumpuser_free(void *);
 void *rumpuser_anonmmap(size_t, int, int, int *);
-void *rumpuser_filemmap(int fd, off_t, size_t, int, int, int *);
+#define RUMPUSER_FILEMMAP_READ		0x01
 #define RUMPUSER_FILEMMAP_WRITE		0x02
 #define RUMPUSER_FILEMMAP_TRUNCATE	0x04
 #define RUMPUSER_FILEMMAP_SHARED	0x08
 void *rumpuser_filemmap(int fd, off_t, size_t, int, int *);
 void  rumpuser_unmap(void *, size_t);
 int   rumpuser_memsync(void *, size_t, int *);
 int rumpuser_open(const char *, int, int *);
 int rumpuser_ioctl(int, u_long, void *, int *);
 int rumpuser_close(int, int *);
 int rumpuser_fsync(int, int *);
 typedef void (*rump_biodone_fn)(void *, size_t, int);
 ssize_t rumpuser_read(int, void *, size_t, int *);
 ssize_t rumpuser_pread(int, void *, size_t, off_t, int *);
 ssize_t rumpuser_write(int, const void *, size_t, int *);
 ssize_t rumpuser_pwrite(int, const void *, size_t, off_t, int *);
 void rumpuser_read_bio(int, void *, size_t, off_t, rump_biodone_fn, void *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rumpuser.c,v 1.36 2009/03/18 10:22:45 cegger Exp $	*/
+/*	$NetBSD: rumpuser.c,v 1.37 2009/03/18 15:32:27 pooka Exp $	*/
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by Google Summer of Code
  * and the Finnish Cultural Foundation.
+ *
  * 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
 @@ -20,27 +20,27 @@
  * 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>
 #if !defined(lint)
-__RCSID("$NetBSD: rumpuser.c,v 1.36 2009/03/18 10:22:45 cegger Exp $");
+__RCSID("$NetBSD: rumpuser.c,v 1.37 2009/03/18 15:32:27 pooka Exp $");
 #endif /* !lint */
 /* thank the maker for this */
 #ifdef __linux__
 #define _XOPEN_SOURCE 500
 #define _BSD_SOURCE
 #define _FILE_OFFSET_BITS 64
 #include <features.h>
 #endif
 #include <sys/param.h>
 #include <sys/event.h>
 #include <sys/ioctl.h>
 @@ -172,52 +172,64 @@ rumpuser_anonmmap(size_t size, int align
 	return rv;
+}
 void
 rumpuser_unmap(void *addr, size_t len)
+{
 	int rv;
 	rv = munmap(addr, len);
 	assert(rv == 0);
+}
 void *
-rumpuser_filemmap(int fd, off_t offset, size_t len, int shared,
+rumpuser_filemmap(int fd, off_t offset, size_t len, int flags, int *error)
 	int dotruncate, int *error)
+{
 	void *rv;
-	int flags;
+	int mmflags, prot;
-	if (dotruncate)
+	if (flags & RUMPUSER_FILEMMAP_TRUNCATE)
 		ftruncate(fd, offset + len);
-	flags = MAP_FILE;
+	mmflags = MAP_FILE;
-	if (shared)
+	if (flags & RUMPUSER_FILEMMAP_SHARED)
-		flags |= MAP_SHARED;
+		mmflags |= MAP_SHARED;
 	else
-		flags |= MAP_PRIVATE;
+		mmflags |= MAP_PRIVATE;
-	rv = mmap(NULL, len, PROT_READ|PROT_WRITE, flags, fd, offset);
+	prot = 0;
 	if (flags & RUMPUSER_FILEMMAP_READ)
 		prot |= PROT_READ;
 	if (flags & RUMPUSER_FILEMMAP_WRITE)
 		prot |= PROT_WRITE;
 	rv = mmap(NULL, len, PROT_READ|PROT_WRITE, mmflags, fd, offset);
 	if (rv == MAP_FAILED) {
 		*error = errno;
 		return NULL;
+	}
 	*error = 0;
 	return rv;
+}
 int
 rumpuser_memsync(void *addr, size_t len, int *error)
+{
 	DOCALL_KLOCK(int, (msync(addr, len, MS_SYNC)));
+}
 int
 rumpuser_open(const char *path, int flags, int *error)
+{
 	DOCALL(int, (open(path, flags, 0644)));
+}
 int
 rumpuser_ioctl(int fd, u_long cmd, void *data, int *error)
+{
 	DOCALL_KLOCK(int, (ioctl(fd, cmd, data)));
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_shmem.c,v 1.4 2009/03/01 20:50:04 pooka Exp $	*/
+/*	$NetBSD: if_shmem.c,v 1.5 2009/03/18 15:32:27 pooka Exp $	*/
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by The Nokia Foundation.
+ *
  * 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
 @@ -18,27 +18,27 @@
  * 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: if_shmem.c,v 1.4 2009/03/01 20:50:04 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.5 2009/03/18 15:32:27 pooka Exp $");
 #include <sys/param.h>
 #include <sys/fcntl.h>
 #include <sys/kmem.h>
 #include <sys/kthread.h>
 #include <sys/lock.h>
 #include <sys/atomic.h>
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 @@ -187,27 +187,28 @@ rump_shmif_create(const char *path, int
 	randnum = arc4random();
 	memcpy(&enaddr[2], &randnum, 4);
 	mynum = atomic_inc_uint_nv(&numif)-1;
 	sc = kmem_zalloc(sizeof(*sc), KM_SLEEP);
 	ifp = &sc->sc_ec.ec_if;
 	memcpy(sc->sc_myaddr, enaddr, sizeof(enaddr));
 	sc->sc_memfd = rumpuser_open(path, O_RDWR | O_CREAT, &error);
 	if (sc->sc_memfd == -1)
 		goto fail;
 	sc->sc_busmem = rumpuser_filemmap(sc->sc_memfd, 0, BUSMEM_SIZE,
-, 1, &error);
+	    RUMPUSER_FILEMMAP_TRUNCATE | RUMPUSER_FILEMMAP_SHARED
 	    | RUMPUSER_FILEMMAP_READ | RUMPUSER_FILEMMAP_WRITE, &error);
 	if (error)
 		goto fail;
 	lockbus(sc);
 	if (*BUSCTRL_ATOFF(sc, IFMEM_LASTPACKET) == 0)
 		*BUSCTRL_ATOFF(sc, IFMEM_LASTPACKET) = IFMEM_DATA;
 	sc->sc_nextpacket = *BUSCTRL_ATOFF(sc, IFMEM_LASTPACKET);
 	sc->sc_prevgen = *BUSCTRL_ATOFF(sc, IFMEM_GENERATION);
 	unlockbus(sc);
 	sc->sc_kq = rumpuser_writewatchfile_setup(-1, sc->sc_memfd, 0, &error);
 	if (sc->sc_kq == -1)
 		goto fail;