Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/pgoyette-compat]: src/sys Don't restrict hooks to having only int or voi...
details: https://anonhg.NetBSD.org/src/rev/408d56ff35f6
branches: pgoyette-compat
changeset: 447592:408d56ff35f6
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Fri Jan 18 00:01:00 2019 +0000
description:
Don't restrict hooks to having only int or void types. Pass the hook's
type to the various macros, as needed.
Allows us to reduce diffs to original in at least one or two places (we
no longer have to provide an additional parameter to the hook routine
for returning a non-int return value).
diffstat:
sys/arch/sparc/fpu/fpu.c | 8 ++++----
sys/compat/common/if_43.c | 8 ++++----
sys/compat/common/uipc_usrreq_70.c | 14 ++++++--------
sys/compat/netbsd32/netbsd32_module.c | 8 ++++----
sys/compat/sys/socket.h | 4 ++--
sys/dev/bio.c | 8 ++++----
sys/dev/ccd.c | 16 ++++++++--------
sys/dev/clockctl.c | 8 ++++----
sys/dev/raidframe/rf_netbsdkintf.c | 12 ++++++------
sys/dev/usb/ugen.c | 6 +++---
sys/dev/usb/uhid.c | 6 +++---
sys/dev/usb/usb.c | 12 ++++++------
sys/dev/vnd.c | 12 ++++++------
sys/dev/wscons/wsevent.c | 8 ++++----
sys/fs/puffs/puffs_msgif.c | 8 ++++----
sys/kern/kern_proc.c | 8 ++++----
sys/kern/kern_rndq.c | 12 ++++++------
sys/kern/sys_module.c | 8 ++++----
sys/kern/sysv_ipc.c | 8 ++++----
sys/kern/tty.c | 8 ++++----
sys/kern/tty_ptm.c | 8 ++++----
sys/kern/uipc_usrreq.c | 24 ++++++++++++------------
sys/kern/vfs_syscalls.c | 8 ++++----
sys/net/if.c | 20 ++++++++++----------
sys/net/if_spppsubr.c | 8 ++++----
sys/net/rtsock.c | 27 +++++++++------------------
sys/net/rtsock_shared.c | 10 +++++-----
sys/net80211/ieee80211_ioctl.c | 6 +++---
sys/opencrypto/cryptodev.c | 8 ++++----
sys/sys/compat_stub.h | 6 +++---
sys/sys/module_hook.h | 13 +++++++------
31 files changed, 155 insertions(+), 165 deletions(-)
diffs (truncated from 1090 to 300 lines):
diff -r cd304a65cae6 -r 408d56ff35f6 sys/arch/sparc/fpu/fpu.c
--- a/sys/arch/sparc/fpu/fpu.c Thu Jan 17 21:32:42 2019 +0000
+++ b/sys/arch/sparc/fpu/fpu.c Fri Jan 18 00:01:00 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.27.46.3 2019/01/14 13:34:26 pgoyette Exp $ */
+/* $NetBSD: fpu.c,v 1.27.46.4 2019/01/18 00:01:00 pgoyette Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.27.46.3 2019/01/14 13:34:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.27.46.4 2019/01/18 00:01:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -122,8 +122,8 @@
/*
* HOOK for checking if the lwp's emul matches sunos
*/
-MODULE_CALL_INT_HOOK_DECL(get_emul_sunos_hook, (const struct emul **emul));
-MODULE_CALL_INT_HOOK(get_emul_sunos_hook, (const struct emul ** emul), (emul),
+MODULE_CALL_HOOK_DECL(get_emul_sunos_hook, int, (const struct emul **emul));
+MODULE_CALL_HOOK(get_emul_sunos_hook, int, (const struct emul ** emul), (emul),
enosys());
/*
diff -r cd304a65cae6 -r 408d56ff35f6 sys/compat/common/if_43.c
--- a/sys/compat/common/if_43.c Thu Jan 17 21:32:42 2019 +0000
+++ b/sys/compat/common/if_43.c Fri Jan 18 00:01:00 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_43.c,v 1.14.2.12 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: if_43.c,v 1.14.2.13 2019/01/18 00:01:00 pgoyette Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.14.2.12 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.14.2.13 2019/01/18 00:01:00 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -84,8 +84,8 @@
* XXX The if43_20 routine doesn't really have any effect, since its
* XXX return value is ignored (see compat/common/if_43.c)!
*/
-MODULE_CALL_INT_HOOK_DECL(if43_20_hook, (u_long ncmd));
-MODULE_CALL_INT_HOOK(if43_20_hook, (u_long ncmd), (ncmd), enosys());
+MODULE_CALL_HOOK_DECL(if43_20_hook, int, (u_long ncmd));
+MODULE_CALL_HOOK(if43_20_hook, int, (u_long ncmd), (ncmd), enosys());
/*
* Use a wrapper so that the compat_cvtcmd() can return a u_long
diff -r cd304a65cae6 -r 408d56ff35f6 sys/compat/common/uipc_usrreq_70.c
--- a/sys/compat/common/uipc_usrreq_70.c Thu Jan 17 21:32:42 2019 +0000
+++ b/sys/compat/common/uipc_usrreq_70.c Fri Jan 18 00:01:00 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq_70.c,v 1.1.20.4 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: uipc_usrreq_70.c,v 1.1.20.5 2019/01/18 00:01:01 pgoyette Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq_70.c,v 1.1.20.4 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq_70.c,v 1.1.20.5 2019/01/18 00:01:01 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -47,9 +47,8 @@
#include <compat/sys/socket.h>
-void
-compat_70_unp_addsockcred(struct mbuf **ret, struct lwp *l,
- struct mbuf *control)
+struct mbuf *
+compat_70_unp_addsockcred(struct lwp *l, struct mbuf *control)
{
struct sockcred70 *sc;
struct mbuf *m;
@@ -58,8 +57,7 @@
m = sbcreatecontrol1(&p, SOCKCRED70SIZE(kauth_cred_ngroups(l->l_cred)),
SCM_OCREDS, SOL_SOCKET, M_WAITOK);
if (m == NULL) {
- *ret = control;
- return;
+ return control;
}
sc = p;
@@ -72,7 +70,7 @@
for (int i = 0; i < sc->sc_ngroups; i++)
sc->sc_groups[i] = kauth_cred_group(l->l_cred, i);
- *ret = m_add(control, m);
+ return m_add(control, m);
}
MODULE_SET_HOOK(compat_70_unp_hook, "unp_70", compat_70_unp_addsockcred);
diff -r cd304a65cae6 -r 408d56ff35f6 sys/compat/netbsd32/netbsd32_module.c
--- a/sys/compat/netbsd32/netbsd32_module.c Thu Jan 17 21:32:42 2019 +0000
+++ b/sys/compat/netbsd32/netbsd32_module.c Fri Jan 18 00:01:00 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_module.c,v 1.6.2.11 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: netbsd32_module.c,v 1.6.2.12 2019/01/18 00:01:01 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.11 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.12 2019/01/18 00:01:01 pgoyette Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -201,10 +201,10 @@
}
/* Module hook for netbsd32_80_modctl */
-MODULE_CALL_INT_HOOK_DECL(compat32_80_modctl_hook,
+MODULE_CALL_HOOK_DECL(compat32_80_modctl_hook, int,
(struct lwp *lwp, const struct netbsd32_modctl_args *uap,
register_t *result));
-MODULE_CALL_INT_HOOK(compat32_80_modctl_hook,
+MODULE_CALL_HOOK(compat32_80_modctl_hook, int,
(struct lwp *lwp, const struct netbsd32_modctl_args *uap,
register_t *result),
(lwp, uap, result),
diff -r cd304a65cae6 -r 408d56ff35f6 sys/compat/sys/socket.h
--- a/sys/compat/sys/socket.h Thu Jan 17 21:32:42 2019 +0000
+++ b/sys/compat/sys/socket.h Fri Jan 18 00:01:00 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.h,v 1.15.2.3 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: socket.h,v 1.15.2.4 2019/01/18 00:01:01 pgoyette Exp $ */
/*
* Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
@@ -104,7 +104,7 @@
int compat_ifioctl(struct socket *, u_long, u_long, void *, struct lwp *);
int compat43_set_accrights(struct msghdr *, void *, int);
-void compat_70_unp_addsockcred(struct mbuf **, struct lwp *, struct mbuf *);
+struct mbuf * compat_70_unp_addsockcred(struct lwp *, struct mbuf *);
void uipc_usrreq_70_init(void);
void uipc_usrreq_70_fini(void);
diff -r cd304a65cae6 -r 408d56ff35f6 sys/dev/bio.c
--- a/sys/dev/bio.c Thu Jan 17 21:32:42 2019 +0000
+++ b/sys/dev/bio.c Fri Jan 18 00:01:00 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bio.c,v 1.13.16.7 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: bio.c,v 1.13.16.8 2019/01/18 00:01:01 pgoyette Exp $ */
/* $OpenBSD: bio.c,v 1.9 2007/03/20 02:35:55 marco Exp $ */
/*
@@ -28,7 +28,7 @@
/* A device controller ioctl tunnelling device. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.13.16.7 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.13.16.8 2019/01/18 00:01:01 pgoyette Exp $");
#include "opt_compat_netbsd.h"
@@ -115,9 +115,9 @@
}
/* Hook up the compat_bio_30 routine */
-MODULE_CALL_INT_HOOK_DECL(compat_bio_30_hook,
+MODULE_CALL_HOOK_DECL(compat_bio_30_hook, int,
(void * cookie, u_long cmd, void *addr, int(*ff)(void *, u_long, void *)));
-MODULE_CALL_INT_HOOK(compat_bio_30_hook,
+MODULE_CALL_HOOK(compat_bio_30_hook, int,
(void * cookie, u_long cmd, void *addr, int(*ff)(void *, u_long, void *)),
(cookie, cmd, addr, ff), enosys());
diff -r cd304a65cae6 -r 408d56ff35f6 sys/dev/ccd.c
--- a/sys/dev/ccd.c Thu Jan 17 21:32:42 2019 +0000
+++ b/sys/dev/ccd.c Fri Jan 18 00:01:00 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.175.2.10 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: ccd.c,v 1.175.2.11 2019/01/18 00:01:01 pgoyette Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.175.2.10 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.175.2.11 2019/01/18 00:01:01 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -1061,12 +1061,12 @@
* This looks ugly, since we pass the "real" ioctl function as an
* argument to the compat_xxx function.
*/
-MODULE_CALL_INT_HOOK_DECL(ccd_ioctl_60_hook, (dev_t dev, u_long cmd, void *data,
- int flag, struct lwp *l, int (*ff)(dev_t, u_long, void *, int,
- struct lwp *)));
-MODULE_CALL_INT_HOOK(ccd_ioctl_60_hook, (dev_t dev, u_long cmd, void *data,
- int flag, struct lwp *l, int (*ff)(dev_t, u_long, void *, int,
- struct lwp *)),
+MODULE_CALL_HOOK_DECL(ccd_ioctl_60_hook, int,
+ (dev_t dev, u_long cmd, void *data, int flag, struct lwp *l,
+ int (*ff)(dev_t, u_long, void *, int, struct lwp *)));
+MODULE_CALL_HOOK(ccd_ioctl_60_hook, int,
+ (dev_t dev, u_long cmd, void *data, int flag, struct lwp *l,
+ int (*ff)(dev_t, u_long, void *, int, struct lwp *)),
(dev, cmd, data, flag, l, ccdioctl), enosys());
/* ARGSUSED */
diff -r cd304a65cae6 -r 408d56ff35f6 sys/dev/clockctl.c
--- a/sys/dev/clockctl.c Thu Jan 17 21:32:42 2019 +0000
+++ b/sys/dev/clockctl.c Fri Jan 18 00:01:00 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl.c,v 1.35.14.10 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: clockctl.c,v 1.35.14.11 2019/01/18 00:01:01 pgoyette Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.14.10 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.14.11 2019/01/18 00:01:01 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_ntp.h"
@@ -201,9 +201,9 @@
}
/* Hook the compat_50 stuff */
-MODULE_CALL_INT_HOOK_DECL(clockctl_ioctl_50_hook,
+MODULE_CALL_HOOK_DECL(clockctl_ioctl_50_hook, int,
(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l));
-MODULE_CALL_INT_HOOK(clockctl_ioctl_50_hook,
+MODULE_CALL_HOOK(clockctl_ioctl_50_hook, int,
(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l),
(dev, cmd, data, flags, l), enosys());
diff -r cd304a65cae6 -r 408d56ff35f6 sys/dev/raidframe/rf_netbsdkintf.c
--- a/sys/dev/raidframe/rf_netbsdkintf.c Thu Jan 17 21:32:42 2019 +0000
+++ b/sys/dev/raidframe/rf_netbsdkintf.c Fri Jan 18 00:01:00 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.356.2.8 2019/01/14 13:34:27 pgoyette Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.356.2.9 2019/01/18 00:01:01 pgoyette Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.356.2.8 2019/01/14 13:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.356.2.9 2019/01/18 00:01:01 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1038,19 +1038,19 @@
}
/* Hooks to call the 5.0 and 8.0 ioctl compat code */
-MODULE_CALL_INT_HOOK_DECL(raidframe50_ioctl_hook,
+MODULE_CALL_HOOK_DECL(raidframe50_ioctl_hook, int,
(int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
RF_Config_t **k_cfg));
-MODULE_CALL_INT_HOOK(raidframe50_ioctl_hook,
+MODULE_CALL_HOOK(raidframe50_ioctl_hook, int,
(int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
RF_Config_t **k_cfg),
(cmd, initted, raidPtr, unit, data, k_cfg),
enosys());
-MODULE_CALL_INT_HOOK_DECL(raidframe80_ioctl_hook,
+MODULE_CALL_HOOK_DECL(raidframe80_ioctl_hook, int,
(int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
RF_Config_t **k_cfg));
-MODULE_CALL_INT_HOOK(raidframe80_ioctl_hook,
+MODULE_CALL_HOOK(raidframe80_ioctl_hook, int,
(int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
RF_Config_t **k_cfg),
(cmd, initted, raidPtr, unit, data, k_cfg),
diff -r cd304a65cae6 -r 408d56ff35f6 sys/dev/usb/ugen.c
--- a/sys/dev/usb/ugen.c Thu Jan 17 21:32:42 2019 +0000
+++ b/sys/dev/usb/ugen.c Fri Jan 18 00:01:00 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.139.2.8 2019/01/14 13:34:27 pgoyette Exp $ */
Home |
Main Index |
Thread Index |
Old Index