PERFORCE change 150431 for review
Bjoern A. Zeeb
bz at FreeBSD.org
Thu Sep 25 12:02:42 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=150431
Change 150431 by bz at bz_dumpster on 2008/09/25 12:01:59
Hide functional changes or structs under#ifdef VIMAGE.
Remove two extra fileds from a sysctl struct as they change
the size of objects and are not yet needed.
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/net/if_gif.h#4 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#4 edit
.. //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#8 edit
Differences ...
==== //depot/projects/vimage-commit2/src/sys/net/if_gif.h#4 (text+ko) ====
@@ -113,12 +113,7 @@
/*
* Virtualization support
*/
-
-#define INIT_VNET_GIF(vnet) \
- INIT_FROM_VNET(vnet, VNET_MOD_GIF, struct vnet_gif, vnet_gif)
-
-#define VNET_GIF(sym) VSYM(vnet_gif, sym)
-
+#ifdef VIMAGE
struct vnet_gif {
LIST_HEAD(, gif_softc) _gif_softc_list;
int _max_gif_nesting;
@@ -126,6 +121,12 @@
int _ip_gif_ttl;
int _ip6_gif_hlim;
};
+#endif
+
+#define INIT_VNET_GIF(vnet) \
+ INIT_FROM_VNET(vnet, VNET_MOD_GIF, struct vnet_gif, vnet_gif)
+
+#define VNET_GIF(sym) VSYM(vnet_gif, sym)
#define V_gif_softc_list VNET_GIF(gif_softc_list)
#define V_max_gif_nesting VNET_GIF(max_gif_nesting)
==== //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#4 (text+ko) ====
@@ -33,6 +33,7 @@
#ifndef _NETINET6_VINET6_H_
#define _NETINET6_VINET6_H_
+#ifdef VIMAGE
#include <sys/socket.h>
#include <netinet/ip6.h>
#include <net/if.h>
@@ -45,13 +46,6 @@
#include <netinet6/nd6.h>
#include <netinet/in_pcb.h>
-#define INIT_VNET_INET6(vnet) \
- INIT_FROM_VNET(vnet, VNET_MOD_INET6, struct vnet_inet6, vnet_inet6)
-
-#define VNET_INET6(sym) VSYM(vnet_inet6, sym)
-
-
-#ifdef VIMAGE
struct vnet_inet6 {
struct in6_ifaddr * _in6_ifaddr;
@@ -162,6 +156,12 @@
#endif
+#define INIT_VNET_INET6(vnet) \
+ INIT_FROM_VNET(vnet, VNET_MOD_INET6, struct vnet_inet6, vnet_inet6)
+
+#define VNET_INET6(sym) VSYM(vnet_inet6, sym)
+
+
/*
* Symbol translation macros
*/
==== //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#8 (text+ko) ====
@@ -162,8 +162,6 @@
const char *oid_fmt;
int oid_refcnt;
const char *oid_descr;
- short oid_v_subs;
- short oid_v_mod;
};
#define SYSCTL_IN(r, p, l) (r->newfunc)(r, p, l)
@@ -177,9 +175,11 @@
int sysctl_handle_string(SYSCTL_HANDLER_ARGS);
int sysctl_handle_opaque(SYSCTL_HANDLER_ARGS);
+#ifdef VIMAGE
int sysctl_handle_v_int(SYSCTL_HANDLER_ARGS);
int sysctl_handle_v_string(SYSCTL_HANDLER_ARGS);
int sysctl_handle_v_opaque(SYSCTL_HANDLER_ARGS);
+#endif
/*
* These functions are used to add/remove an oid from the mib.
@@ -406,30 +406,6 @@
#define FEATURE(name, desc) \
SYSCTL_INT(_kern_features, OID_AUTO, name, CTLFLAG_RD, 0, 1, desc)
-/*
- * Resolve void *arg1 in a proper virtualization container.
- */
-#ifdef VIMAGE
-#define SYSCTL_RESOLVE_V_ARG1() do { \
- char *cp; \
- switch (oidp->oid_v_subs) { \
- case V_NET: \
- cp = (char *) \
- TD_TO_VNET(curthread)->mod_data[oidp->oid_v_mod]; \
- break; \
- case V_PROCG: \
- cp = (char *) TD_TO_VPROCG(curthread); \
- break; \
- case V_CPU: \
- cp = (char *) TD_TO_VCPU(curthread); \
- break; \
- default: \
- panic("unsupported module id %d", oidp->oid_v_subs); \
- } \
- arg1 = cp + (size_t) arg1; \
-} while (0)
-#endif
-
#endif /* _KERNEL */
/*
More information about the p4-projects
mailing list