fixed 'xid' parameter transmission
[util-vserver.git] / util-vserver / lib / vserver-internal.h
index 43cd3c7..9bf730e 100644 (file)
@@ -48,7 +48,7 @@
     int        ver = utilvserver_checkCompatVersion();         \
     if (ver==-1) return -1;                            \
     VC_SUFFIX, __VA_ARGS__, VC_PREFIX;                 \
-    errno = EINVAL;                                    \
+    errno = ENOSYS;                                    \
     return -1;                                         \
   } while (0)
 #else
 #endif
 
 #ifdef VC_ENABLE_API_OLDPROC
-#  define CALL_VC_OLDPROC(F,...)       CALL_VC_GENERAL(0x00000000, X, F, __VA_ARGS__)
+#  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   : \
                                 ((X)==(uint32_t)(-2)) ? VC_SAMECTX : \
 #  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)