X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fvserver-internal.h;h=4e71afd59657157a352b63ac087653796c40a164;hb=251cd4e2b90ee7d97699e7b903ad9812c472e715;hp=055dd07075d8295fbfecc7083a9cf4520123a451;hpb=60eb97440f168c25135c63ef3ce06cf6c0babdda;p=util-vserver.git diff --git a/lib/vserver-internal.h b/lib/vserver-internal.h index 055dd07..4e71afd 100644 --- a/lib/vserver-internal.h +++ b/lib/vserver-internal.h @@ -50,7 +50,7 @@ inline static ALWAYSINLINE void vc_noop0() {} # define CALL_VC(...) \ do { \ int ver = utilvserver_checkCompatVersion(); \ - int UNUSED conf = utilvserver_checkCompatConfig(); \ + uint_least32_t UNUSED conf = utilvserver_checkCompatConfig(); \ if (ver==-1) return -1; \ VC_SUFFIX, __VA_ARGS__, VC_PREFIX; \ errno = ENOSYS; \ @@ -114,18 +114,36 @@ inline static ALWAYSINLINE void vc_noop0() {} # define CALL_VC_V21(F,...) CALL_VC_NOOP #endif -#ifdef VC_ENABLE_API_V21 +#if defined(VC_ENABLE_API_V21) || defined(VC_ENABLE_API_V22) || defined(VC_ENABLE_API_V23) # define CALL_VC_SPACES(F,...) CALL_VC_GENERAL_CONFIG(VC_VCI_SPACES, spaces, F, __VA_ARGS__) #else # define CALL_VC_SPACES(F,...) CALL_VC_NOOP #endif +#ifdef VC_ENABLE_API_V22 +# define CALL_VC_V22(F,...) CALL_VC_GENERAL(0x00020200, v22, F, __VA_ARGS__) +#else +# define CALL_VC_V22(F,...) CALL_VC_NOOP +#endif + +#ifdef VC_ENABLE_API_V23 +# define CALL_VC_V23(F,...) CALL_VC_GENERAL(0x00020300, v23, F, __VA_ARGS__) +#else +# define CALL_VC_V23(F,...) CALL_VC_NOOP +#endif + #ifdef VC_ENABLE_API_NET # define CALL_VC_NET(F,...) CALL_VC_GENERAL(0x00010016, net, F, __VA_ARGS__) #else # define CALL_VC_NET(F,...) CALL_VC_NOOP #endif +#if defined(VC_ENABLE_API_NETV2) +# define CALL_VC_NETV2(F,...) CALL_VC_GENERAL_CONFIG(VC_VCI_NETV2, netv2, F, __VA_ARGS__) +#else +# define CALL_VC_NETV2(F,...) CALL_VC_NOOP +#endif + #ifdef VC_ENABLE_API_FSCOMPAT # define CALL_VC_FSCOMPAT(F,...) CALL_VC_GENERAL(0x00010000, fscompat, F, __VA_ARGS__) #else @@ -205,24 +223,6 @@ inline static ALWAYSINLINE void vc_noop0() {} # define NID_KERNEL2USER(X) (X) #endif -#if 1 -# define NETTYPE_USER2KERNEL(X) ((X)==vcNET_IPV4 ? NXA_TYPE_IPV4 : \ - (X)==vcNET_IPV6 ? NXA_TYPE_IPV6 : \ - (X)==vcNET_IPV4B ? (NXA_TYPE_IPV4 | NXA_MOD_BCAST) : \ - (X)==vcNET_IPV6B ? (NXA_TYPE_IPV6 | NXA_MOD_BCAST) : \ - (X)==vcNET_ANY ? NXA_TYPE_ANY : \ - (X)) -# define NETTYPE_KERNEL2USER(X) ((X)==NXA_TYPE_IPV4 ? vcNET_IPV4 : \ - (X)==NXA_TYPE_IPV6 ? vcNET_IPV6 : \ - (X)==(NXA_TYPE_IPV4|NXA_MOD_BCAST) ? vcNET_IPV4B : \ - (X)==(NXA_TYPE_IPV6|NXA_MOD_BCAST) ? vcNET_IPV6B : \ - (X)==NXA_TYPE_ANY ? vcNET_ANY : \ - (X)) -#else -# define NETTYPE_USER2KERNEL(X) (X) -# define NETTYPE_KERNEL2USER(X) (X) -#endif - #define CDLIM_USER2KERNEL(X) ((X)==VC_CDLIM_UNSET ? CDLIM_UNSET : \ (X)==VC_CDLIM_INFINITY ? CDLIM_INFINITY : \ (X)==VC_CDLIM_KEEP ? CDLIM_KEEP : \ @@ -253,10 +253,6 @@ inline static ALWAYSINLINE void vc_noop0() {} inline static UNUSED ALWAYSINLINE int vserver(uint32_t cmd, uint32_t id, void *data) { -#if defined __dietlibc__ - extern long int syscall (long int __sysno, ...); -#endif - return syscall(__NR_vserver, cmd, id, data); } #else