// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#ifdef H_VSERVER_SYSCALL_INTERNAL_H
+# error vserver-internal.h must not be included more than once
+#endif
#ifndef H_VSERVER_SYSCALL_INTERNAL_H
#define H_VSERVER_SYSCALL_INTERNAL_H
#define CALL_VC_GENERAL(ID, SUFFIX, FUNC, ...) \
VC_PREFIX; VC_SELECT(ID) return FUNC ## _ ## SUFFIX(__VA_ARGS__); VC_SUFFIX
-#if 1
-# define VC_SELECT(ID) case ID: if(1)
+#ifdef VC_MULTIVERSION_SYSCALL
+# define VC_SELECT(ID) if (ver>=(ID))
# define CALL_VC(...) \
- switch (utilvserver_checkCompatVersion()&~0xff) { \
- case -1 & ~0xff : if (1) break; \
- VC_SUFFIX, __VA_ARGS__ , VC_PREFIX; \
- default : errno = EINVAL; \
- } \
- return -1
+ do { \
+ int ver = utilvserver_checkCompatVersion(); \
+ if (ver==-1) return -1; \
+ VC_SUFFIX, __VA_ARGS__, VC_PREFIX; \
+ errno = ENOSYS; \
+ return -1; \
+ } while (0)
#else
# define VC_SELECT(ID) if (1)
-# define CALL_VC(...) \
- if (1) {} VC_SUFFIX, __VA_ARGS__, VC_PREFIX; \
- errno = ENOSYS; return -1
+# define CALL_VC(...) \
+ do { \
+ if (1) {} VC_SUFFIX, __VA_ARGS__, VC_PREFIX; \
+ errno = ENOSYS; return -1; \
+ } while (0)
#endif
#ifdef VC_ENABLE_API_COMPAT
# define CALL_VC_V11(F,...) CALL_VC_NOOP
#endif
+#ifdef VC_ENABLE_API_V13
+# define CALL_VC_V13(F,...) CALL_VC_GENERAL(0x00010010, v13, F, __VA_ARGS__)
+#else
+# define CALL_VC_V13(F,...) CALL_VC_NOOP
+#endif
+
+#ifdef VC_ENABLE_API_FSCOMPAT
+# define CALL_VC_FSCOMPAT(F,...) CALL_VC_GENERAL(0x00010000, fscompat, F, __VA_ARGS__)
+#else
+# define CALL_VC_FSCOMPAT(F,...) CALL_VC_NOOP
+#endif
+
+#ifdef VC_ENABLE_API_OLDPROC
+# define CALL_VC_OLDPROC(F,...) CALL_VC_GENERAL(0x00000000, oldproc, F, __VA_ARGS__)
+#else
+# define CALL_VC_OLDPROC(F,...) CALL_VC_NOOP
+#endif
+
+#ifdef VC_ENABLE_API_OLDUTS
+# define CALL_VC_OLDUTS(F,...) CALL_VC_GENERAL(0x00000000, olduts, F, __VA_ARGS__)
+#else
+# define CALL_VC_OLDUTS(F,...) CALL_VC_NOOP
+#endif
+
+
+ // Some kernel <-> userspace wrappers; they should be noops in most cases
#if 1
# define CTX_KERNEL2USER(X) (((X)==(uint32_t)(-1)) ? VC_NOCTX : \
# define EXT2FLAGS_USER2KERNEL(X) (X)
#endif
+#if 1
+# define VHI_USER2KERNEL(X) ((((X)==vcVHI_CONTEXT) ? VHIN_CONTEXT : \
+ ((X)==vcVHI_SYSNAME) ? VHIN_SYSNAME : \
+ ((X)==vcVHI_NODENAME) ? VHIN_NODENAME : \
+ ((X)==vcVHI_RELEASE) ? VHIN_RELEASE : \
+ ((X)==vcVHI_VERSION) ? VHIN_VERSION : \
+ ((X)==vcVHI_MACHINE) ? VHIN_MACHINE : \
+ ((X)==vcVHI_DOMAINNAME) ? VHIN_DOMAINNAME : \
+ (X)))
+# define VHI_KERNEL2USER(X) ((((X)==VHIN_CONTEXT) ? vcVHI_CONTEXT : \
+ ((X)==VHIN_SYSNAME) ? vcVHI_SYSNAME : \
+ ((X)==VHIN_NODENAME) ? vcVHI_NODENAME : \
+ ((X)==VHIN_RELEASE) ? vcVHI_RELEASE : \
+ ((X)==VHIN_VERSION) ? vcVHI_VERSION : \
+ ((X)==VHIN_MACHINE) ? vcVHI_MACHINE : \
+ ((X)==VHIN_DOMAINNAME) ? vcVHI_DOMAINNAME : \
+ (X)))
+#else
+# define VHI_USER2KERNEL(X) (X)
+# define VHI_KERNEL2USER(X) (X)
+#endif
+
#define EXT2_IOC_GETCONTEXT _IOR('x', 1, long)
#define EXT2_IOC_SETCONTEXT _IOW('x', 2, long)
#ifndef HAVE_VSERVER
-#if defined(__pic__) && defined(__i386)
+#ifdef ENSC_SYSCALL_TRADITIONAL
inline static UNUSED ALWAYSINLINE
int vserver(uint32_t cmd, uint32_t id, void *data)
{