Page MenuHomeFreeBSD
Differential D40186

pf: remove the use of caddr_t
ClosedPublic
Actions

Authored by kp on May 20 2023, 6:38 PM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 25 2025, 6:32 AM
Unknown Object (File)
Feb 10 2025, 11:11 AM
Unknown Object (File)
Jan 26 2025, 6:10 PM
Unknown Object (File)
Jan 24 2025, 5:31 PM
Unknown Object (File)
Jan 23 2025, 2:27 AM
Unknown Object (File)
Jan 22 2025, 2:01 AM
Unknown Object (File)
Dec 15 2024, 2:53 AM
Unknown Object (File)
Nov 21 2024, 10:22 AM
View All 60 Files
Subscribers
ae
farrokhi
imp
melifaro
zlei

Details

Reviewers
glebius
zlei
Group Reviewers
network
Commits
rGc4a32455d9cb: pf: remove the use of caddr_t
Summary

Replace caddr_t with void *, or more accurate types.

Suggested by: glebius

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kp created this revision.May 20 2023, 6:38 PM
Herald added subscribers: melifaro, farrokhi, ae, imp. · View Herald TranscriptMay 20 2023, 6:38 PM
kp requested review of this revision.May 20 2023, 6:38 PM
Harbormaster completed remote builds in B51584: Diff 122171.May 20 2023, 6:38 PM
zlei accepted this revision as: zlei.May 23 2023, 1:42 AM
zlei added a subscriber: zlei.

Looks good to me.

This revision is now accepted and ready to land.May 23 2023, 1:42 AM
Closed by commit rGc4a32455d9cb: pf: remove the use of caddr_t (authored by kp). · Explain WhyMay 23 2023, 2:13 PM
This revision was automatically updated to reflect the committed changes.
kp added a commit: rGc4a32455d9cb: pf: remove the use of caddr_t.

Revision Contents
Changeset List

PathSize
sys/
net/
6 lines
netpfil/
pf/
4 lines
4 lines

Diff 122291

View Options

sys/net/pfvar.h

Show First 20 Lines • Show All 969 Lines • ▼ Show 20 Lines
* - setup various driver entry points * - setup various driver entry points
* - invoke the vmbus hv main init routine * - invoke the vmbus hv main init routine
* - get the irq resource * - get the irq resource
* - invoke the vmbus to add the vmbus root device * - invoke the vmbus to add the vmbus root device
* - setup the vmbus root device * - setup the vmbus root device
* - retrieve the channel offers * - retrieve the channel offers
*/ */
static int static int
vmbus_bus_init(void) vmbus_doattach(struct vmbus_softc *sc)
{ {
struct vmbus_softc *sc = vmbus_get_softc();
int ret; int ret;
if (sc->vmbus_flags & VMBUS_FLAG_ATTACHED) if (sc->vmbus_flags & VMBUS_FLAG_ATTACHED)
return (0); return (0);
sc->vmbus_flags |= VMBUS_FLAG_ATTACHED; sc->vmbus_flags |= VMBUS_FLAG_ATTACHED;
/* /*
* Create context for "post message" Hypercalls * Create context for "post message" Hypercalls
▲ Show 20 Lines • Show All 88 Lines • ▼ Show 20 Lines#ifndef EARLY_AP_STARTUP
/* /*
* If the system has already booted and thread * If the system has already booted and thread
* scheduling is possible indicated by the global * scheduling is possible indicated by the global
* cold set to zero, we just call the driver * cold set to zero, we just call the driver
* initialization directly. * initialization directly.
*/ */
if (!cold) if (!cold)
#endif #endif
vmbus_bus_init(); vmbus_doattach(vmbus_sc);
bus_generic_probe(dev); bus_generic_probe(dev);
return (0); return (0);
} }
static void static void
vmbus_sysinit(void *arg __unused) vmbus_sysinit(void *arg __unused)
{ {
if (vm_guest != VM_GUEST_HV || vmbus_get_softc() == NULL) struct vmbus_softc *sc = vmbus_get_softc();
if (vm_guest != VM_GUEST_HV || sc == NULL)
return; return;
#ifndef EARLY_AP_STARTUP #ifndef EARLY_AP_STARTUP
/* /*
* If the system has already booted and thread * If the system has already booted and thread
* scheduling is possible, as indicated by the * scheduling is possible, as indicated by the
* global cold set to zero, we just call the driver * global cold set to zero, we just call the driver
* initialization directly. * initialization directly.
*/ */
if (!cold) if (!cold)
#endif #endif
vmbus_bus_init(); vmbus_doattach(sc);
} }
static int static int
vmbus_detach(device_t dev) vmbus_detach(device_t dev)
{ {
struct vmbus_softc *sc = device_get_softc(dev); struct vmbus_softc *sc = device_get_softc(dev);
hv_vmbus_release_unattached_channels(); hv_vmbus_release_unattached_channels();
▲ Show 20 Lines • Show All 57 Lines • Show Last 20 Lines
View Options

sys/netpfil/pf/pf_ioctl.c

Show First 20 Lines • Show All 969 Lines • ▼ Show 20 Lines
* - setup various driver entry points * - setup various driver entry points
* - invoke the vmbus hv main init routine * - invoke the vmbus hv main init routine
* - get the irq resource * - get the irq resource
* - invoke the vmbus to add the vmbus root device * - invoke the vmbus to add the vmbus root device
* - setup the vmbus root device * - setup the vmbus root device
* - retrieve the channel offers * - retrieve the channel offers
*/ */
static int static int
vmbus_bus_init(void) vmbus_doattach(struct vmbus_softc *sc)
{ {
struct vmbus_softc *sc = vmbus_get_softc();
int ret; int ret;
if (sc->vmbus_flags & VMBUS_FLAG_ATTACHED) if (sc->vmbus_flags & VMBUS_FLAG_ATTACHED)
return (0); return (0);
sc->vmbus_flags |= VMBUS_FLAG_ATTACHED; sc->vmbus_flags |= VMBUS_FLAG_ATTACHED;
/* /*
* Create context for "post message" Hypercalls * Create context for "post message" Hypercalls
▲ Show 20 Lines • Show All 88 Lines • ▼ Show 20 Lines#ifndef EARLY_AP_STARTUP
/* /*
* If the system has already booted and thread * If the system has already booted and thread
* scheduling is possible indicated by the global * scheduling is possible indicated by the global
* cold set to zero, we just call the driver * cold set to zero, we just call the driver
* initialization directly. * initialization directly.
*/ */
if (!cold) if (!cold)
#endif #endif
vmbus_bus_init(); vmbus_doattach(vmbus_sc);
bus_generic_probe(dev); bus_generic_probe(dev);
return (0); return (0);
} }
static void static void
vmbus_sysinit(void *arg __unused) vmbus_sysinit(void *arg __unused)
{ {
if (vm_guest != VM_GUEST_HV || vmbus_get_softc() == NULL) struct vmbus_softc *sc = vmbus_get_softc();
if (vm_guest != VM_GUEST_HV || sc == NULL)
return; return;
#ifndef EARLY_AP_STARTUP #ifndef EARLY_AP_STARTUP
/* /*
* If the system has already booted and thread * If the system has already booted and thread
* scheduling is possible, as indicated by the * scheduling is possible, as indicated by the
* global cold set to zero, we just call the driver * global cold set to zero, we just call the driver
* initialization directly. * initialization directly.
*/ */
if (!cold) if (!cold)
#endif #endif
vmbus_bus_init(); vmbus_doattach(sc);
} }
static int static int
vmbus_detach(device_t dev) vmbus_detach(device_t dev)
{ {
struct vmbus_softc *sc = device_get_softc(dev); struct vmbus_softc *sc = device_get_softc(dev);
hv_vmbus_release_unattached_channels(); hv_vmbus_release_unattached_channels();
▲ Show 20 Lines • Show All 57 Lines • Show Last 20 Lines
View Options

sys/netpfil/pf/pf_norm.c

Show First 20 Lines • Show All 969 Lines • ▼ Show 20 Lines
* - setup various driver entry points * - setup various driver entry points
* - invoke the vmbus hv main init routine * - invoke the vmbus hv main init routine
* - get the irq resource * - get the irq resource
* - invoke the vmbus to add the vmbus root device * - invoke the vmbus to add the vmbus root device
* - setup the vmbus root device * - setup the vmbus root device
* - retrieve the channel offers * - retrieve the channel offers
*/ */
static int static int
vmbus_bus_init(void) vmbus_doattach(struct vmbus_softc *sc)
{ {
struct vmbus_softc *sc = vmbus_get_softc();
int ret; int ret;
if (sc->vmbus_flags & VMBUS_FLAG_ATTACHED) if (sc->vmbus_flags & VMBUS_FLAG_ATTACHED)
return (0); return (0);
sc->vmbus_flags |= VMBUS_FLAG_ATTACHED; sc->vmbus_flags |= VMBUS_FLAG_ATTACHED;
/* /*
* Create context for "post message" Hypercalls * Create context for "post message" Hypercalls
▲ Show 20 Lines • Show All 88 Lines • ▼ Show 20 Lines#ifndef EARLY_AP_STARTUP
/* /*
* If the system has already booted and thread * If the system has already booted and thread
* scheduling is possible indicated by the global * scheduling is possible indicated by the global
* cold set to zero, we just call the driver * cold set to zero, we just call the driver
* initialization directly. * initialization directly.
*/ */
if (!cold) if (!cold)
#endif #endif
vmbus_bus_init(); vmbus_doattach(vmbus_sc);
bus_generic_probe(dev); bus_generic_probe(dev);
return (0); return (0);
} }
static void static void
vmbus_sysinit(void *arg __unused) vmbus_sysinit(void *arg __unused)
{ {
if (vm_guest != VM_GUEST_HV || vmbus_get_softc() == NULL) struct vmbus_softc *sc = vmbus_get_softc();
if (vm_guest != VM_GUEST_HV || sc == NULL)
return; return;
#ifndef EARLY_AP_STARTUP #ifndef EARLY_AP_STARTUP
/* /*
* If the system has already booted and thread * If the system has already booted and thread
* scheduling is possible, as indicated by the * scheduling is possible, as indicated by the
* global cold set to zero, we just call the driver * global cold set to zero, we just call the driver
* initialization directly. * initialization directly.
*/ */
if (!cold) if (!cold)
#endif #endif
vmbus_bus_init(); vmbus_doattach(sc);
} }
static int static int
vmbus_detach(device_t dev) vmbus_detach(device_t dev)
{ {
struct vmbus_softc *sc = device_get_softc(dev); struct vmbus_softc *sc = device_get_softc(dev);
hv_vmbus_release_unattached_channels(); hv_vmbus_release_unattached_channels();
▲ Show 20 Lines • Show All 57 Lines • Show Last 20 Lines