Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/rump "rumppriv" goes back to "rump" per internal interfa...
details: https://anonhg.NetBSD.org/src/rev/4c23dd935dfc
branches: trunk
changeset: 748131:4c23dd935dfc
user: pooka <pooka%NetBSD.org@localhost>
date: Wed Oct 14 18:18:53 2009 +0000
description:
"rumppriv" goes back to "rump" per internal interface naming change.
diffstat:
sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c | 6 +-
sys/rump/include/rump/rump.h | 6 +--
sys/rump/librump/rumpkern/arch/i386/rumpcpu.c | 6 +-
sys/rump/librump/rumpkern/emul.c | 10 ++--
sys/rump/librump/rumpkern/rump.c | 52 ++++++++++++------------
sys/rump/librump/rumpkern/sysproxy_socket.c | 14 +++---
sys/rump/librump/rumpuser/rumpuser_dl.c | 6 +-
sys/rump/librump/rumpvfs/compat.c | 12 ++--
sys/rump/librump/rumpvfs/rump_vfs.c | 58 +++++++++++++-------------
sys/rump/librump/rumpvfs/rumpfs.c | 10 ++--
sys/rump/net/lib/libvirtif/if_virt.c | 6 +-
11 files changed, 91 insertions(+), 95 deletions(-)
diffs (truncated from 808 to 300 lines):
diff -r a6b12ea6de12 -r 4c23dd935dfc sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c
--- a/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c Wed Oct 14 18:16:41 2009 +0000
+++ b/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c Wed Oct 14 18:18:53 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_rumpglue.c,v 1.10 2009/10/14 17:29:19 pooka Exp $ */
+/* $NetBSD: puffs_rumpglue.c,v 1.11 2009/10/14 18:18:53 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_rumpglue.c,v 1.10 2009/10/14 17:29:19 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_rumpglue.c,v 1.11 2009/10/14 18:18:53 pooka Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -163,7 +163,7 @@
}
int
-rumppriv_syspuffs_glueinit(int fd, int *newfd)
+rump_syspuffs_glueinit(int fd, int *newfd)
{
struct ptargs *pap;
int rv;
diff -r a6b12ea6de12 -r 4c23dd935dfc sys/rump/include/rump/rump.h
--- a/sys/rump/include/rump/rump.h Wed Oct 14 18:16:41 2009 +0000
+++ b/sys/rump/include/rump/rump.h Wed Oct 14 18:18:53 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.h,v 1.31 2009/10/14 17:29:19 pooka Exp $ */
+/* $NetBSD: rump.h,v 1.32 2009/10/14 18:18:53 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -65,10 +65,6 @@
/* rumpkern */
enum rump_uiorw { RUMPUIO_READ, RUMPUIO_WRITE };
typedef int (*rump_sysproxy_t)(int, void *, uint8_t *, size_t, register_t *);
-#define rump_cred_suserput(c) rump_cred_put(c)
-/* COMPAT_NETHACK */
-#define WizardMode() rump_cred_suserget()
-#define YASD(cred) rump_cred_suserput(cred)
/* rumpvfs */
#define RUMPCN_FREECRED 0x02
diff -r a6b12ea6de12 -r 4c23dd935dfc sys/rump/librump/rumpkern/arch/i386/rumpcpu.c
--- a/sys/rump/librump/rumpkern/arch/i386/rumpcpu.c Wed Oct 14 18:16:41 2009 +0000
+++ b/sys/rump/librump/rumpkern/arch/i386/rumpcpu.c Wed Oct 14 18:18:53 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpcpu.c,v 1.4 2009/10/14 17:29:19 pooka Exp $ */
+/* $NetBSD: rumpcpu.c,v 1.5 2009/10/14 18:18:53 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpcpu.c,v 1.4 2009/10/14 17:29:19 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpcpu.c,v 1.5 2009/10/14 18:18:53 pooka Exp $");
#include <sys/param.h>
@@ -50,7 +50,7 @@
x86_curlwp()
{
- return rumppriv_get_curlwp();
+ return rump_get_curlwp();
}
void
diff -r a6b12ea6de12 -r 4c23dd935dfc sys/rump/librump/rumpkern/emul.c
--- a/sys/rump/librump/rumpkern/emul.c Wed Oct 14 18:16:41 2009 +0000
+++ b/sys/rump/librump/rumpkern/emul.c Wed Oct 14 18:18:53 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.99 2009/10/14 17:29:19 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.100 2009/10/14 18:18:53 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.99 2009/10/14 17:29:19 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.100 2009/10/14 18:18:53 pooka Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -439,7 +439,7 @@
k = kmem_alloc(sizeof(struct kthdesc), KM_SLEEP);
k->f = func;
k->arg = arg;
- k->mylwp = l = rumppriv_setup_curlwp(0, rump_nextlid(), 0);
+ k->mylwp = l = rump_setup_curlwp(0, rump_nextlid(), 0);
if (flags & KTHREAD_MPSAFE)
l->l_pflag |= LP_MPSAFE;
rv = rumpuser_thread_create(threadbouncer, k, thrname);
@@ -457,7 +457,7 @@
if ((curlwp->l_pflag & LP_MPSAFE) == 0)
KERNEL_UNLOCK_ONE(NULL);
- rumppriv_clear_curlwp();
+ rump_clear_curlwp();
rumpuser_thread_exit();
}
@@ -731,7 +731,7 @@
cpu_reboot(int howto, char *bootstr)
{
- rumppriv_reboot(howto);
+ rump_reboot(howto);
/* this function is __dead, we must exit */
rumpuser_exit(0);
diff -r a6b12ea6de12 -r 4c23dd935dfc sys/rump/librump/rumpkern/rump.c
--- a/sys/rump/librump/rumpkern/rump.c Wed Oct 14 18:16:41 2009 +0000
+++ b/sys/rump/librump/rumpkern/rump.c Wed Oct 14 18:18:53 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.122 2009/10/14 17:29:19 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.123 2009/10/14 18:18:53 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.122 2009/10/14 17:29:19 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.123 2009/10/14 18:18:53 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -226,7 +226,7 @@
loginit();
kauth_init();
- rump_susercred = rumppriv_cred_create(0, 0, 0, NULL);
+ rump_susercred = rump_cred_create(0, 0, 0, NULL);
l = &lwp0;
p = &proc0;
@@ -238,7 +238,7 @@
p->p_vmspace = &rump_vmspace;
p->p_emul = &emul_rump;
p->p_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
- l->l_cred = rumppriv_cred_suserget();
+ l->l_cred = rump_cred_suserget();
l->l_proc = p;
l->l_lid = 1;
l->l_cpu = &rump_cpu;
@@ -297,7 +297,7 @@
/* maybe support sys_reboot some day for remote shutdown */
void
-rumppriv_reboot(int howto)
+rump_reboot(int howto)
{
/* dump means we really take the dive here */
@@ -324,7 +324,7 @@
}
struct uio *
-rumppriv_uio_setup(void *buf, size_t bufsize, off_t offset, enum rump_uiorw rw)
+rump_uio_setup(void *buf, size_t bufsize, off_t offset, enum rump_uiorw rw)
{
struct uio *uio;
enum uio_rw uiorw;
@@ -356,21 +356,21 @@
}
size_t
-rumppriv_uio_getresid(struct uio *uio)
+rump_uio_getresid(struct uio *uio)
{
return uio->uio_resid;
}
off_t
-rumppriv_uio_getoff(struct uio *uio)
+rump_uio_getoff(struct uio *uio)
{
return uio->uio_offset;
}
size_t
-rumppriv_uio_free(struct uio *uio)
+rump_uio_free(struct uio *uio)
{
size_t resid;
@@ -384,7 +384,7 @@
/* public interface */
static pid_t nextpid = 1;
struct lwp *
-rumppriv_newproc_switch()
+rump_newproc_switch()
{
struct lwp *oldlwp = curlwp;
pid_t mypid;
@@ -394,14 +394,14 @@
mypid = atomic_inc_uint_nv(&nextpid);
rumpuser_set_curlwp(NULL);
- rumppriv_setup_curlwp(mypid, 0, 1);
+ rump_setup_curlwp(mypid, 0, 1);
return oldlwp;
}
/* rump private */
struct lwp *
-rumppriv_setup_curlwp(pid_t pid, lwpid_t lid, int set)
+rump_setup_curlwp(pid_t pid, lwpid_t lid, int set)
{
struct lwp *l;
struct proc *p;
@@ -420,7 +420,7 @@
p = &proc0;
}
- l->l_cred = rumppriv_cred_suserget();
+ l->l_cred = rump_cred_suserget();
l->l_proc = p;
l->l_lid = lid;
l->l_fd = p->p_fd;
@@ -443,7 +443,7 @@
}
void
-rumppriv_clear_curlwp(void)
+rump_clear_curlwp(void)
{
struct lwp *l;
struct proc *p;
@@ -454,7 +454,7 @@
mutex_obj_free(p->p_lock);
fd_free();
rump_proc_vfs_release(p);
- rumppriv_cred_put(l->l_cred);
+ rump_cred_put(l->l_cred);
kmem_free(p, sizeof(*p));
}
kmem_free(l, sizeof(*l));
@@ -462,7 +462,7 @@
}
struct lwp *
-rumppriv_get_curlwp(void)
+rump_get_curlwp(void)
{
struct lwp *l;
@@ -474,7 +474,7 @@
}
void
-rumppriv_set_curlwp(struct lwp *l)
+rump_set_curlwp(struct lwp *l)
{
/* clear current */
@@ -484,7 +484,7 @@
}
kauth_cred_t
-rumppriv_cred_create(uid_t uid, gid_t gid, size_t ngroups, gid_t *groups)
+rump_cred_create(uid_t uid, gid_t gid, size_t ngroups, gid_t *groups)
{
kauth_cred_t cred;
int rv;
@@ -505,14 +505,14 @@
}
void
-rumppriv_cred_put(kauth_cred_t cred)
+rump_cred_put(kauth_cred_t cred)
{
kauth_cred_free(cred);
}
kauth_cred_t
-rumppriv_cred_suserget(void)
+rump_cred_suserget(void)
{
kauth_cred_hold(rump_susercred);
@@ -542,7 +542,7 @@
}
int
-rumppriv_module_init(struct modinfo *mi, prop_dictionary_t props)
Home |
Main Index |
Thread Index |
Old Index