From 94da184f68d8113495f9619cba2ffd73508e2edb Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Sun, 19 Jul 2009 15:21:42 +0000 Subject: [PATCH] Expose the definitions of 'struct vnet' and 'VNET_MAGIC_N' to userspace if _WANT_VNET is defined. This is required so that libkvm can locate virtual network stack instances in order to reach their global variables for monitoring and crashdump analysis. Reviewed by: bz Approved by: re (kib) --- sys/sys/vimage.h | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/sys/sys/vimage.h b/sys/sys/vimage.h index 69ab3d632565..eeed2695b4ff 100644 --- a/sys/sys/vimage.h +++ b/sys/sys/vimage.h @@ -33,13 +33,31 @@ #ifndef _SYS_VIMAGE_H_ #define _SYS_VIMAGE_H_ -#include +/* + * struct vnet describes a virtualized network stack, and is primarily a + * pointer to storage for virtualized global variables. Expose to userspace + * as required for libkvm. + */ +#if defined(_KERNEL) || defined(_WANT_VNET) #include +struct vnet { + LIST_ENTRY(vnet) vnet_le; /* all vnets list */ + u_int vnet_magic_n; + u_int ifcnt; + u_int sockcnt; + void *vnet_data_mem; + uintptr_t vnet_data_base; +}; + +#define VNET_MAGIC_N 0x3e0d8f29 +#endif + #ifdef _KERNEL #include #include +#include #ifdef INVARIANTS #define VNET_DEBUG @@ -115,19 +133,8 @@ void vnet_foreach(void (*vnet_foreach_fn)(struct vnet *, void *), #endif /* VIMAGE */ -struct vnet { - LIST_ENTRY(vnet) vnet_le; /* all vnets list */ - u_int vnet_magic_n; - u_int ifcnt; - u_int sockcnt; - void *vnet_data_mem; - uintptr_t vnet_data_base; -}; - #define curvnet curthread->td_vnet -#define VNET_MAGIC_N 0x3e0d8f29 - #ifdef VIMAGE #ifdef VNET_DEBUG #define VNET_ASSERT(condition) \