Date: Tue, 14 Apr 2009 09:16:19 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 160603 for review Message-ID: <200904140916.n3E9GJbg040585@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=160603 Change 160603 by zec@zec_amdx2 on 2009/04/14 09:15:27 Unbreak GENERIC build - more fixes follow... Affected files ... .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_rrip.c#12 edit .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#78 edit .. //depot/projects/vimage/src/sys/kern/uipc_domain.c#20 edit .. //depot/projects/vimage/src/sys/net/if.c#75 edit .. //depot/projects/vimage/src/sys/net/if_gif.c#27 edit .. //depot/projects/vimage/src/sys/net/if_loop.c#43 edit .. //depot/projects/vimage/src/sys/net/route.c#45 edit .. //depot/projects/vimage/src/sys/net/vnet.h#23 edit .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#52 edit .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#24 edit .. //depot/projects/vimage/src/sys/netgraph/ng_ether.c#22 edit .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#20 edit .. //depot/projects/vimage/src/sys/netinet/accf_http.c#9 edit .. //depot/projects/vimage/src/sys/netinet/if_ether.c#41 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#71 edit .. //depot/projects/vimage/src/sys/sys/kernel.h#17 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#86 edit Differences ... ==== //depot/projects/vimage/src/sys/fs/cd9660/cd9660_rrip.c#12 (text+ko) ==== ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#78 (text+ko) ==== @@ -72,11 +72,6 @@ MALLOC_DEFINE(M_VPROCG, "vprocg", "process group control block"); MALLOC_DEFINE(M_VCPU, "vcpu", "cpu resource control block"); -#ifndef VIMAGE_GLOBALS -static int vnet_mod_constructor(struct vnet_modlink *); -static int vnet_mod_destructor(struct vnet_modlink *); -#endif - #ifdef VIMAGE static struct vimage *vi_alloc(struct vimage *, char *); static int vi_destroy(struct vimage *); @@ -96,6 +91,7 @@ static TAILQ_HEAD(vnet_modpending_head, vnet_modlink) vnet_modpending_head; static void vnet_mod_complete_registration(struct vnet_modlink *); static int vnet_mod_constructor(struct vnet_modlink *); +static int vnet_mod_destructor(struct vnet_modlink *); int vi_symlookup(struct kld_sym_lookup *lookup, char *symstr) @@ -262,16 +258,16 @@ if (vml->vml_iarg) printf("/%s", vml->vml_iname); printf(": "); - if (vmi->vmi_struct_size) - printf("malloc(%zu); ", vmi->vmi_struct_size); + if (vmi->vmi_size) + printf("malloc(%zu); ", vmi->vmi_size); if (vmi->vmi_iattach != NULL) printf("iattach()"); printf("\n"); #endif #ifdef VIMAGE - if (vmi->vmi_struct_size) { - void *mem = malloc(vmi->vmi_struct_size, M_VNET, + if (vmi->vmi_size) { + void *mem = malloc(vmi->vmi_size, M_VNET, M_NOWAIT | M_ZERO); if (mem == NULL) /* XXX should return error, not panic. */ panic("vi_alloc: malloc for %s\n", vmi->vmi_name); @@ -297,7 +293,7 @@ printf(": "); if (vmi->vmi_idetach != NULL) printf("idetach(); "); - if (vmi->vmi_struct_size) + if (vmi->vmi_size) printf("free()"); printf("\n"); #endif @@ -306,7 +302,7 @@ vmi->vmi_idetach(vml->vml_iarg); #ifdef VIMAGE - if (vmi->vmi_struct_size) { + if (vmi->vmi_size) { if (curvnet->mod_data[vmi->vmi_id] == NULL) panic("vi_destroy: %s\n", vmi->vmi_name); vi_free(curvnet->mod_data[vmi->vmi_id], M_VNET); ==== //depot/projects/vimage/src/sys/kern/uipc_domain.c#20 (text+ko) ==== @@ -111,7 +111,9 @@ .vmi_id = VNET_MOD_DOMAIN, .vmi_name = "domain", .vmi_iattach = net_init_domain, +#ifdef VIMAGE .vmi_idetach = net_detach_domain, +#endif }; #endif ==== //depot/projects/vimage/src/sys/net/if.c#75 (text+ko) ==== @@ -192,7 +192,9 @@ .vmi_size = sizeof(struct vnet_net), .vmi_symmap = vnet_net_symmap, .vmi_iattach = vnet_net_iattach, - .vmi_idettach = vnet_net_idettach +#ifdef VIMAGE + .vmi_idetach = vnet_net_idetach +#endif }; #endif /* !VIMAGE_GLOBALS */ ==== //depot/projects/vimage/src/sys/net/if_gif.c#27 (text+ko) ==== @@ -167,7 +167,6 @@ SYSCTL_V_INT(V_NET, vnet_gif, _net_link_gif, OID_AUTO, parallel_tunnels, CTLFLAG_RW, parallel_tunnels, 0, "Allow parallel tunnels?"); -VNET_MOD_DECLARE(GIF, gif, vnet_gif_iattach, NULL, NET, NULL) /* copy from src/sys/net/if_ethersubr.c */ static const u_char etherbroadcastaddr[ETHER_ADDR_LEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; ==== //depot/projects/vimage/src/sys/net/if_loop.c#43 (text+ko) ==== @@ -126,7 +126,9 @@ .vmi_id = VNET_MOD_LOIF, .vmi_name = "loif", .vmi_iattach = vnet_loif_iattach, - .vmi_idettach = vnet_loif_idettach +#ifdef VIMAGE + .vmi_idetach = vnet_loif_idetach +#endif }; #endif /* !VIMAGE_GLOBALS */ ==== //depot/projects/vimage/src/sys/net/route.c#45 (text+ko) ==== @@ -107,13 +107,18 @@ static void rt_maskedcopy(struct sockaddr *, struct sockaddr *, struct sockaddr *); static int vnet_route_iattach(const void *); +#ifdef VIMAGE +static int vnet_route_idetach(const void *); +#endif #ifndef VIMAGE_GLOBALS static const vnet_modinfo_t vnet_rtable_modinfo = { .vmi_id = VNET_MOD_RTABLE, .vmi_name = "rtable", .vmi_iattach = vnet_route_iattach, - .vmi_idettach = vnet_route_idettach +#ifdef VIMAGE + .vmi_idetach = vnet_route_idetach +#endif }; #endif /* !VIMAGE_GLOBALS */ @@ -159,11 +164,11 @@ SYSCTL_PROC(_net, OID_AUTO, my_fibnum, CTLTYPE_INT|CTLFLAG_RD, NULL, 0, &sysctl_my_fibnum, "I", "default FIB of caller"); -static int -rtable_init(const void *unused) +static void +route_init(void) { - /* whack the tunable ints into line. */ + /* whack the tunable ints into line. */ if (rt_numfibs > RT_MAXFIBS) rt_numfibs = RT_MAXFIBS; if (rt_numfibs == 0) @@ -173,14 +178,14 @@ #ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_rtable_modinfo); #else - vnet_route_iattach(NULL); + rtable_init(NULL); #endif } static int vnet_route_iattach(const void *unused __unused) { - INIT_VNET_INET(curvnet); + INIT_VNET_NET(curvnet); int table; struct domain *dom; int fam; @@ -215,7 +220,7 @@ #ifdef VIMAGE static int -rtable_idetach(const void *unused) +vnet_route_idetach(const void *unused) { int table; int fam; @@ -241,26 +246,6 @@ } #endif -VNET_MOD_DECLARE_STATELESS(RTABLE, rtable, rtable_init, rtable_idetach, NET); - -static void -route_init(void) -{ - - /* whack the tunable ints into line. */ - if (rt_numfibs > RT_MAXFIBS) - rt_numfibs = RT_MAXFIBS; - if (rt_numfibs == 0) - rt_numfibs = 1; - rn_init(); /* initialize all zeroes, all ones, mask table */ - -#ifndef VIMAGE_GLOBALS - vnet_mod_register(&vnet_rtable_modinfo); -#else - rtable_init(NULL); -#endif -} - #ifndef _SYS_SYSPROTO_H_ struct setfib_args { int fibnum; ==== //depot/projects/vimage/src/sys/net/vnet.h#23 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#52 (text+ko) ==== @@ -271,8 +271,17 @@ static vnet_detach_fn vnet_netgraph_idetach; #endif /* VIMAGE */ -VNET_MOD_DECLARE(NETGRAPH, netgraph, vnet_netgraph_iattach, - vnet_netgraph_idetach, LOIF, NULL) +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_netgraph_modinfo = { + .vmi_id = VNET_MOD_NETGRAPH, + .vmi_name = "netgraph", + .vmi_dependson = VNET_MOD_LOIF, + .vmi_iattach = vnet_netgraph_iattach, +#ifdef VIMAGE + .vmi_idetach = vnet_netgraph_idetach +#endif +}; +#endif #ifdef NETGRAPH_DEBUG /*----------------------------------------------*/ /* @@ -3125,7 +3134,7 @@ break; } } -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_netgraph_modinfo); #else vnet_netgraph_iattach(NULL); ==== //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#24 (text+ko) ==== @@ -120,8 +120,15 @@ static struct unrhdr *ng_eiface_unit; #endif -VNET_MOD_DECLARE_STATELESS(NG_EIFACE, ng_eiface, ng_eiface_iattach, - ng_eiface_idetach, NETGRAPH) +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_ng_eiface_modinfo = { + .vmi_id = VNET_MOD_NG_EIFACE, + .vmi_name = "ng_eiface", + .vmi_dependson = VNET_MOD_NETGRAPH, + .vmi_iattach = ng_eiface_iattach, + .vmi_idetach = ng_eiface_idetach, +}; +#endif /************************************************************************ INTERFACE STUFF @@ -605,14 +612,14 @@ switch (event) { case MOD_LOAD: -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_ng_eiface_modinfo); #else ng_eiface_iattach(NULL); #endif break; case MOD_UNLOAD: -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_deregister(&vnet_ng_eiface_modinfo); #else ng_eiface_idetach(NULL); ==== //depot/projects/vimage/src/sys/netgraph/ng_ether.c#22 (text+ko) ==== @@ -77,8 +77,14 @@ static vnet_attach_fn ng_ether_iattach; -VNET_MOD_DECLARE_STATELESS(NG_ETHER, ng_ether, ng_ether_iattach, - NULL, NETGRAPH) +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_ng_ether_modinfo = { + .vmi_id = VNET_MOD_NG_ETHER, + .vmi_name = "ng_ether", + .vmi_dependson = VNET_MOD_NETGRAPH, + .vmi_iattach = ng_ether_iattach, +}; +#endif /* Per-node private data */ struct private { @@ -775,7 +781,7 @@ ng_ether_input_p = ng_ether_input; ng_ether_input_orphan_p = ng_ether_input_orphan; ng_ether_link_state_p = ng_ether_link_state; -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_ng_ether_modinfo); #else error = ng_ether_iattach(NULL); ==== //depot/projects/vimage/src/sys/netgraph/ng_iface.c#20 (text+ko) ==== @@ -219,8 +219,15 @@ static struct unrhdr *ng_iface_unit; #endif -VNET_MOD_DECLARE_STATELESS(NG_IFACE, ng_iface, ng_iface_iattach, - ng_iface_idetach, NETGRAPH) +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_ng_iface_modinfo = { + .vmi_id = VNET_MOD_NG_IFACE, + .vmi_name = "ng_iface", + .vmi_dependson = VNET_MOD_NETGRAPH, + .vmi_iattach = ng_iface_iattach, + .vmi_idetach = ng_iface_idetach +}; +#endif /************************************************************************ HELPER STUFF @@ -878,14 +885,14 @@ switch (event) { case MOD_LOAD: -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_ng_iface_modinfo); #else ng_iface_iattach(NULL); #endif break; case MOD_UNLOAD: -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_deregister(&vnet_ng_iface_modinfo); #else ng_iface_idetach(NULL); ==== //depot/projects/vimage/src/sys/netinet/accf_http.c#9 (text+ko) ==== @@ -95,8 +95,12 @@ static vnet_attach_fn vnet_accf_http_iattach; -VNET_MOD_DECLARE(ACCF_HTTP, accf_http, vnet_accf_http_iattach, - NULL, INET, NULL) +vnet_modinfo_t vnet_accf_http_modinfo = { + .vmi_id = VNET_MOD_ACCF_HTTP, + .vmi_name = "accf_http", + .vmi_dependson = VNET_MOD_INET, + .vmi_iattach = vnet_accf_http_iattach +}; SYSCTL_NODE(_net_inet_accf, OID_AUTO, http, CTLFLAG_RW, 0, "HTTP accept filter"); ==== //depot/projects/vimage/src/sys/netinet/if_ether.c#41 (text+ko) ==== @@ -114,7 +114,6 @@ static int arp_iattach(const void *); void arprequest(struct ifnet *, struct in_addr *, struct in_addr *, u_char *); -static int arp_iattach(const void *); static void arpintr(struct mbuf *); static void arptimer(void *); #ifdef INET @@ -132,7 +131,6 @@ #ifdef AF_INET void arp_ifscrub(struct ifnet *ifp, uint32_t addr); -VNET_MOD_DECLARE_STATELESS(ARP, arp, arp_iattach, NULL, INET) /* * called by in_ifscrub to remove entry from the table when ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#71 (text+ko) ==== @@ -115,7 +115,18 @@ static int vnet_ipfw_iattach(const void *); static int vnet_ipfw_idetach(const void *); -VNET_MOD_DECLARE(IPFW, ipfw, vnet_ipfw_iattach, vnet_ipfw_idetach, INET, NULL) +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_ipfw_modinfo = { + .vmi_id = VNET_MOD_IPFW, + .vmi_name = "ipfw", + .vmi_size = sizeof(struct vnet_ipfw), + .vmi_dependson = VNET_MOD_INET, + .vmi_iattach = vnet_ipfw_iattach, +#ifdef VIMAGE + .vmi_idetach = vnet_ipfw_idetach +#endif +}; +#endif /* * set_disable contains one bit per set value (0..31). ==== //depot/projects/vimage/src/sys/sys/kernel.h#17 (text+ko) ==== @@ -172,7 +172,6 @@ SI_SUB_KTHREAD_BUF = 0xea00000, /* buffer daemon*/ SI_SUB_KTHREAD_UPDATE = 0xec00000, /* update daemon*/ SI_SUB_KTHREAD_IDLE = 0xee00000, /* idle procs*/ - SI_SUB_VIMAGE_DONE = 0xef00000, /* clear curvnet*/ SI_SUB_SMP = 0xf000000, /* start the APs*/ SI_SUB_RUN_SCHEDULER = 0xfffffff /* scheduler*/ }; ==== //depot/projects/vimage/src/sys/sys/vimage.h#86 (text+ko) ==== @@ -49,10 +49,6 @@ typedef int vnet_attach_fn(const void *); typedef int vnet_detach_fn(const void *); -#ifndef VIMAGE_GLOBALS - -#ifndef VIMAGE_GLOBALS - struct vimage; struct vprocg; struct vnet; @@ -77,72 +73,11 @@ #define curvnet NULL #endif -#define VNET_SYMMAP(mod, name) \ - { #name, offsetof(struct vnet_##mod, _##name), \ - sizeof(((struct vnet_##mod *) curthread)->_##name) } - -#define VNET_MOD_NONE_VERSION 2008122301 - #ifndef VIMAGE_GLOBALS -#ifdef VIMAGE -#define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson, m_symmap) \ - static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ - .vmi_id = VNET_MOD_##m_name_uc, \ - .vmi_dependson = VNET_MOD_##m_dependson, \ - .vmi_name = #m_name_lc, \ - .vmi_iattach = m_iattach, \ - .vmi_idetach = m_idetach, \ - .vmi_struct_size = \ - sizeof(struct vnet_##m_name_lc), \ - .vmi_symmap = m_symmap \ -}; -#define VNET_MOD_DECLARE_STATELESS(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson) \ - static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ - .vmi_id = VNET_MOD_##m_name_uc, \ - .vmi_dependson = VNET_MOD_##m_dependson, \ - .vmi_name = #m_name_lc, \ - .vmi_iattach = m_iattach, \ - .vmi_idetach = m_idetach \ -}; -#else /* !VIMAGE */ -#define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson, m_symmap) \ - static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ - .vmi_id = VNET_MOD_##m_name_uc, \ - .vmi_dependson = VNET_MOD_##m_dependson, \ - .vmi_name = #m_name_lc, \ - .vmi_iattach = m_iattach, \ - .vmi_struct_size = \ - sizeof(struct vnet_##m_name_lc), \ - .vmi_symmap = m_symmap \ -}; -#define VNET_MOD_DECLARE_STATELESS(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson) \ - static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ - .vmi_id = VNET_MOD_##m_name_uc, \ - .vmi_dependson = VNET_MOD_##m_dependson, \ - .vmi_name = #m_name_lc, \ - .vmi_iattach = m_iattach \ -}; -#endif -#else /* VIMAGE_GLOBALS */ -#define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson, m_symmap) -#define VNET_MOD_DECLARE_STATELESS(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson) -#endif - -typedef int vnet_attach_fn(const void *); -typedef int vnet_detach_fn(const void *); - -#ifndef VIMAGE_GLOBALS - struct vnet_symmap { char *name; - size_t offset; - size_t size; + size_t offset; + size_t size; }; typedef struct vnet_symmap vnet_symmap_t; @@ -152,7 +87,7 @@ char *vmi_name; vnet_attach_fn *vmi_iattach; vnet_detach_fn *vmi_idetach; - size_t vmi_struct_size; + size_t vmi_size; struct vnet_symmap *vmi_symmap; }; typedef struct vnet_modinfo vnet_modinfo_t; @@ -163,9 +98,16 @@ const void *vml_iarg; const char *vml_iname; }; + +#ifdef VIMAGE #define VNET_SYMMAP(mod, name) \ - { #name, &(vnet_ ## mod ## _0._ ## name), \ + { #name, offsetof(struct vnet_ ## mod, _ ## name), \ + sizeof(((struct vnet_ ## mod *) curthread)->_ ## name) } +#else +#define VNET_SYMMAP(mod, name) \ + { #name, (size_t) &(vnet_ ## mod ## _0._ ## name), \ sizeof(vnet_ ## mod ## _0._ ## name) } +#endif #define VNET_SYMMAP_END { NULL, 0 } @@ -210,16 +152,6 @@ #define V_MOD_vnet_gif VNET_MOD_GIF #define V_MOD_vnet_ipsec VNET_MOD_IPSEC -int vi_symlookup(struct kld_sym_lookup *, char *); -void vnet_mod_register(const struct vnet_modinfo *); -void vnet_mod_register_multi(const struct vnet_modinfo *, void *, char *); - -#define VNET_SYMMAP_END { NULL, 0 } - -#define VNET_SYMMAP(mod, name) \ - { #name, &(vnet_ ## mod ## _0._ ## name), \ - sizeof(vnet_ ## mod ## _0._ ## name) } - #define basevnet thread0.td_ucred->cr_vimage->v_net #define basevprocg thread0.td_ucred->cr_vimage->v_procg #define basevcpu thread0.td_ucred->cr_vimage->v_cpu @@ -229,56 +161,10 @@ #define V_PROCG 2 #define V_CPU 3 -/* statefull modules */ -#define VNET_MOD_NET 0 -#define VNET_MOD_NETGRAPH 1 -#define VNET_MOD_INET 2 -#define VNET_MOD_INET6 3 -#define VNET_MOD_IPSEC 4 -#define VNET_MOD_IPFW 5 -#define VNET_MOD_DUMMYNET 6 -#define VNET_MOD_PF 7 -#define VNET_MOD_ALTQ 8 -#define VNET_MOD_IPX 9 -#define VNET_MOD_ATALK 10 -#define VNET_MOD_ACCF_HTTP 11 -#define VNET_MOD_IGMP 12 - -/* stateless modules */ -#define VNET_MOD_NG_ETHER 20 -#define VNET_MOD_NG_IFACE 21 -#define VNET_MOD_NG_EIFACE 22 -#define VNET_MOD_ESP 23 -#define VNET_MOD_IPIP 24 -#define VNET_MOD_AH 25 -#define VNET_MOD_IPCOMP 26 -#define VNET_MOD_GIF 27 -#define VNET_MOD_ARP 28 -#define VNET_MOD_RTABLE 29 -#define VNET_MOD_LOIF 30 -#define VNET_MOD_DOMAIN 31 -#define VNET_MOD_DYNAMIC_START 32 -#define VNET_MOD_MAX 64 - -/* Sysctl virtualization macros need these name mappings bellow */ -#define V_MOD_vnet_net VNET_MOD_NET -#define V_MOD_vnet_netgraph VNET_MOD_NETGRAPH -#define V_MOD_vnet_inet VNET_MOD_INET -#define V_MOD_vnet_inet6 VNET_MOD_INET6 -#define V_MOD_vnet_ipfw VNET_MOD_IPFW -#define V_MOD_vnet_pf VNET_MOD_PF -#define V_MOD_vnet_gif VNET_MOD_GIF -#define V_MOD_vnet_ipsec VNET_MOD_IPSEC - -int vi_symlookup(struct kld_sym_lookup *, char *); -void vnet_mod_register(const struct vnet_modinfo *); -void vnet_mod_register_multi(const struct vnet_modinfo *, void *, char *); - #define V_MOD_vprocg 0 #define V_MOD_vcpu 0 #ifdef VIMAGE - struct vnet { void *mod_data[VNET_MOD_MAX]; @@ -291,13 +177,13 @@ u_int vnet_magic_n; }; - +#endif /* VIMAGE */ #endif /* !VIMAGE_GLOBALS */ #define VNET_MAGIC_N 0x3e0d8f29 +#ifdef VIMAGE #ifdef VNET_DEBUG - #define VNET_ASSERT(condition) \ if (!(condition)) { \ printf("VNET_ASSERT @ %s:%d %s():\n", \ @@ -333,9 +219,7 @@ __FILE__, __LINE__, __FUNCTION__, \ vnet, curvnet); \ modtype *sym = (vnet)->mod_data[modindex]; - #else /* !VNET_DEBUG */ - #define VNET_ASSERT(condition) #define CURVNET_SET(arg) \ @@ -350,7 +234,6 @@ #define INIT_FROM_VNET(vnet, modindex, modtype, sym) \ modtype *sym = (vnet)->mod_data[modindex]; - #endif /* !VNET_DEBUG */ #define VNET_ITERATOR_DECL(arg) struct vnet *arg; @@ -380,11 +263,11 @@ /* Non-VIMAGE null-macros */ #define IS_DEFAULT_VNET(arg) 1 +#define VNET_ASSERT(condition) +#define INIT_FROM_VNET(vnet, modindex, modtype, sym) #define CURVNET_SET(arg) #define CURVNET_SET_QUIET(arg) #define CURVNET_RESTORE() -#define VNET_ASSERT(condition) -#define INIT_FROM_VNET(vnet, modindex, modtype, sym) #define VNET_ITERATOR_DECL(arg) #define VNET_FOREACH(arg) #define VNET_LIST_RLOCK() @@ -426,7 +309,7 @@ void vnet_mod_deregister(const struct vnet_modinfo *); void vnet_mod_register_multi(const struct vnet_modinfo *, void *, char *); void vnet_mod_deregister_multi(const struct vnet_modinfo *, void *, char *); -int vi_symlookup(struct kld_sym_lookup *, char *); +int vi_symlookup(struct kld_sym_lookup *, char *); #endif #ifdef VIMAGE
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904140916.n3E9GJbg040585>