X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2Fvserver-internal.h;h=02c5349bb3ca844cd9edadaad79ad2e2db3f0621;hb=38fe8b4a2dd28aebf52787c5b65cc79490fa53d3;hp=a4ece36b9a85e8413f13545da31b27e0e31b1ef1;hpb=a97d526478ada6f471aea7adb17c3e7c4528900b;p=util-vserver.git diff --git a/util-vserver/lib/vserver-internal.h b/util-vserver/lib/vserver-internal.h index a4ece36..02c5349 100644 --- a/util-vserver/lib/vserver-internal.h +++ b/util-vserver/lib/vserver-internal.h @@ -79,11 +79,23 @@ #endif #ifdef VC_ENABLE_API_V13 -# define CALL_VC_V13(F,...) CALL_VC_GENERAL(0x00010010, v13, F, __VA_ARGS__) +# define CALL_VC_V13(F,...) CALL_VC_GENERAL(0x00010011, v13, F, __VA_ARGS__) #else # define CALL_VC_V13(F,...) CALL_VC_NOOP #endif +#ifdef VC_ENABLE_API_V13 +# define CALL_VC_V13A(F,...) CALL_VC_GENERAL(0x00010012, v13, F, __VA_ARGS__) +#else +# define CALL_VC_V13A(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 + #ifdef VC_ENABLE_API_FSCOMPAT # define CALL_VC_FSCOMPAT(F,...) CALL_VC_GENERAL(0x00010000, fscompat, F, __VA_ARGS__) #else @@ -110,8 +122,8 @@ ((X)==(uint32_t)(-2)) ? VC_SAMECTX : \ (xid_t)(X)) -# define CTX_USER2KERNEL(X) (((X)==VC_RANDCTX) ? (uint32_t)(-1) : \ - ((X)==VC_SAMECTX) ? (uint32_t)(-2) : \ +# define CTX_USER2KERNEL(X) (((X)==VC_DYNAMIC_XID) ? (uint32_t)(-1) : \ + ((X)==VC_SAMECTX) ? (uint32_t)(-2) : \ (uint32_t)(X)) #else # define CTX_USER2KERNEL(X) (X) @@ -152,6 +164,33 @@ # define VHI_KERNEL2USER(X) (X) #endif +#if 1 +# define NID_KERNEL2USER(X) (((X)==(uint32_t)(-1)) ? VC_NONID : \ + (xid_t)(X)) + +# define NID_USER2KERNEL(X) (((X)==VC_DYNAMIC_NID) ? (uint32_t)(-1) : \ + (uint32_t)(X)) +#else +# define NID_USER2KERNEL(X) (X) +# define NID_KERNEL2USER(X) (X) +#endif + +#if 1 +# define NETTYPE_USER2KERNEL(X) ((X)==vcNET_IPV4 ? 0 : \ + (X)==vcNET_IPV6 ? 1 : \ + (X)==vcNET_IPV4R ? 2 : \ + (X)==vcNET_IPV6R ? 3 : \ + (X)) +# define NETTYPE_KERNEL2USER(X) ((X)==0 ? vcNET_IPV4 ? : \ + (X)==1 ? vcNET_IPV6 ? : \ + (X)==2 ? vcNET_IPV4R ? : \ + (X)==3 ? vcNET_IPV6R ? : \ + (vc_net_nx_type)(X)) +#else +# define NETTYPE_USER2KERNEL(X) (X) +# define NETTYPE_KERNEL2USER(X) (X) +#endif + #define EXT2_IOC_GETCONTEXT _IOR('x', 1, long) #define EXT2_IOC_SETCONTEXT _IOW('x', 2, long)