X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fvserver-internal.h;h=6478e5d74b38c998cffa3ed05bb19c415b3bfb02;hb=a7079774d8c30a1a2eafce390b1f1689fb2f1539;hp=b1728b6176ce3b9431cf596bf85e63596d538bfe;hpb=9c78378bebc1a9f3d400f422df8ede9efea57dea;p=util-vserver.git diff --git a/lib/vserver-internal.h b/lib/vserver-internal.h index b1728b6..6478e5d 100644 --- a/lib/vserver-internal.h +++ b/lib/vserver-internal.h @@ -41,12 +41,16 @@ inline static ALWAYSINLINE void vc_noop0() {} #define CALL_VC_NOOP vc_noop0() #define CALL_VC_GENERAL(ID, SUFFIX, FUNC, ...) \ VC_PREFIX; VC_SELECT(ID) return FUNC ## _ ## SUFFIX(__VA_ARGS__); VC_SUFFIX +#define CALL_VC_GENERAL_CONFIG(BIT, SUFFIX, FUNC, ...) \ + VC_PREFIX; VC_CBIT(BIT) return FUNC ## _ ## SUFFIX(__VA_ARGS__); VC_SUFFIX #ifdef VC_MULTIVERSION_SYSCALL # define VC_SELECT(ID) if (ver>=(ID)) +# define VC_CBIT(BIT) if ((conf&BIT) == BIT) # define CALL_VC(...) \ do { \ int ver = utilvserver_checkCompatVersion(); \ + uint_least32_t conf = utilvserver_checkCompatConfig(); \ if (ver==-1) return -1; \ VC_SUFFIX, __VA_ARGS__, VC_PREFIX; \ errno = ENOSYS; \ @@ -54,6 +58,7 @@ inline static ALWAYSINLINE void vc_noop0() {} } while (0) #else # define VC_SELECT(ID) if (1) +# define VC_CBIT(BIT) if (1) # define CALL_VC(...) \ do { \ if (1) {} VC_SUFFIX, __VA_ARGS__, VC_PREFIX; \ @@ -103,6 +108,17 @@ inline static ALWAYSINLINE void vc_noop0() {} # define CALL_VC_V13OBS(F,...) CALL_VC_NOOP #endif +#ifdef VC_ENABLE_API_V21 +# define CALL_VC_V21(F,...) CALL_VC_GENERAL(0x00020100, v21, F, __VA_ARGS__) +#else +# define CALL_VC_V21(F,...) CALL_VC_NOOP +#endif + +#ifdef VC_ENABLE_API_V21 +# 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_NET # define CALL_VC_NET(F,...) CALL_VC_GENERAL(0x00010016, net, F, __VA_ARGS__) @@ -237,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