X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fvserver-internal.h;h=30ff3fc9f9c64da89bce1dd506bd97383ce3dd26;hb=4e63a3343f7f5a4ac9f6d18bac1ad51b5cfd042d;hp=4e71afd59657157a352b63ac087653796c40a164;hpb=a6be71d3e49f0f633705ba5e4e08cc1cac811344;p=util-vserver.git diff --git a/lib/vserver-internal.h b/lib/vserver-internal.h index 4e71afd..30ff3fc 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(); \ - uint_least32_t UNUSED conf = utilvserver_checkCompatConfig(); \ + vc_vci_t UNUSED conf = utilvserver_checkCompatConfig(); \ if (ver==-1) return -1; \ VC_SUFFIX, __VA_ARGS__, VC_PREFIX; \ errno = ENOSYS; \ @@ -120,6 +120,12 @@ inline static ALWAYSINLINE void vc_noop0() {} # define CALL_VC_SPACES(F,...) CALL_VC_NOOP #endif +#if defined(VC_ENABLE_API_V23) +# define CALL_VC_TAG(F,...) CALL_VC_GENERAL_CONFIG(VC_VCI_PPTAG, tag, F, __VA_ARGS__) +#else +# define CALL_VC_TAG(F,...) CALL_VC_NOOP +#endif + #ifdef VC_ENABLE_API_V22 # define CALL_VC_V22(F,...) CALL_VC_GENERAL(0x00020200, v22, F, __VA_ARGS__) #else @@ -132,6 +138,12 @@ inline static ALWAYSINLINE void vc_noop0() {} # define CALL_VC_V23(F,...) CALL_VC_NOOP #endif +#ifdef VC_ENABLE_API_V23 +# define CALL_VC_V23P(F,...) CALL_VC_GENERAL(0x00020304, v23, F, __VA_ARGS__) +#else +# define CALL_VC_V23P(F,...) CALL_VC_NOOP +#endif + #ifdef VC_ENABLE_API_NET # define CALL_VC_NET(F,...) CALL_VC_GENERAL(0x00010016, net, F, __VA_ARGS__) #else @@ -179,6 +191,19 @@ inline static ALWAYSINLINE void vc_noop0() {} #endif #if 1 +# define TAG_KERNEL2USER(X) (((X)==(uint32_t)(-1)) ? VC_NOCTX : \ + ((X)==(uint32_t)(-2)) ? VC_SAMECTX : \ + (tag_t)(X)) + +# define TAG_USER2KERNEL(X) (((X)==VC_DYNAMIC_XID) ? (uint32_t)(-1) : \ + ((X)==VC_SAMECTX) ? (uint32_t)(-2) : \ + (uint32_t)(X)) +#else +# define TAG_USER2KERNEL(X) (X) +# define TAG_KERNEL2USER(X) (X) +#endif + +#if 1 # define EXT2FLAGS_USER2KERNEL(X) (((X) & ~(VC_IMMUTABLE_FILE_FL|VC_IMMUTABLE_LINK_FL)) | \ ((X) & VC_IMMUTABLE_FILE_FL ? EXT2_IMMUTABLE_FILE_FL : 0) | \ ((X) & VC_IMMUTABLE_LINK_FL ? EXT2_IMMUTABLE_LINK_FL : 0)) @@ -248,6 +273,12 @@ inline static ALWAYSINLINE void vc_noop0() {} #define EXT2_IOC_GETCONTEXT _IOR('x', 1, long) #define EXT2_IOC_SETCONTEXT _IOW('x', 2, long) +#if defined(__GNUC__) +# define VC_ATTR_HIDDEN __attribute__ ((hidden)) +#else +# define VC_ATTR_HIDDEN +#endif + #ifndef HAVE_VSERVER #ifdef ENSC_SYSCALL_TRADITIONAL inline static UNUSED ALWAYSINLINE