Make vc_get_ccaps do the right thing.
authorDaniel Hokka Zakrisson <daniel@hozac.com>
Mon, 16 Jul 2007 15:10:08 +0000 (15:10 +0000)
committerDaniel Hokka Zakrisson <daniel@hozac.com>
Mon, 16 Jul 2007 15:10:08 +0000 (15:10 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2564 94cd875c-1c1d-0410-91d2-eb244daf1a30

lib/syscall_getccaps-v21.hc [new file with mode: 0644]
lib/syscall_getccaps.c

diff --git a/lib/syscall_getccaps-v21.hc b/lib/syscall_getccaps-v21.hc
new file mode 100644 (file)
index 0000000..b6ba7ec
--- /dev/null
@@ -0,0 +1,43 @@
+// $Id$    --*- c -*--
+
+// Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+//  
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+//  
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//  
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+static inline ALWAYSINLINE int
+vc_get_ccaps_v21(xid_t xid, struct vc_ctx_caps *caps)
+{
+  struct vcmd_ctx_caps_v1      k_ccaps;
+  struct vcmd_bcaps            k_bcaps;
+  int                          res;
+  
+  res = vserver(VCMD_get_ccaps, CTX_USER2KERNEL(xid), &k_ccaps);
+  if (res)
+    return res;
+  res = vserver(VCMD_get_bcaps, CTX_USER2KERNEL(xid), &k_bcaps);
+  if (res)
+    return res;
+
+  caps->bcaps = k_bcaps.bcaps;
+  caps->bmask = k_bcaps.bmask;
+  caps->ccaps = k_ccaps.ccaps;
+  caps->cmask = k_ccaps.cmask;
+
+  return res;
+}
index 7d72ab6..29c5b13 100644 (file)
 #endif
 
 #include "vserver.h"
-#include "vserver-internal.h"
 #include "virtual.h"
 
+#if defined(VC_ENABLE_API_V13) && defined(VC_ENABLE_API_V21)
+#  define VC_MULTIVERSION_SYSCALL 1
+#endif
+#include "vserver-internal.h"
+
 #if defined(VC_ENABLE_API_V13)
 #  include "syscall_getccaps-v13.hc"
 #endif
 
-#if defined(VC_ENABLE_API_V13)
+#if defined(VC_ENABLE_API_V21)
+#  include "syscall_getccaps-v21.hc"
+#endif
+
+#if defined(VC_ENABLE_API_V13) || defined(VC_ENABLE_API_V21)
 int
 vc_get_ccaps(xid_t xid, struct vc_ctx_caps *caps)
 {
@@ -37,6 +45,7 @@ vc_get_ccaps(xid_t xid, struct vc_ctx_caps *caps)
     return -1;
   }
 
-  CALL_VC(CALL_VC_V13A(vc_get_ccaps, xid, caps));
+  CALL_VC(CALL_VC_V21(vc_get_ccaps, xid, caps),
+         CALL_VC_V13A(vc_get_ccaps, xid, caps));
 }
 #endif