This commit was generated by cvs2svn to compensate for changes in r2562,

[util-vserver.git] / kernel / context_cmd.h

diff --git a/kernel/context_cmd.h b/kernel/context_cmd.h
index f631095..354b29d 100644 (file)
--- a/kernel/context_cmd.h
+++ b/kernel/context_cmd.h
@@ -6,10 +6,6 @@
 
 #define VCMD_task_xid          VC_CMD(VINFO, 1, 0)
 
-#ifdef __KERNEL__
-extern int vc_task_xid(uint32_t, void __user *);
-
-#endif /* __KERNEL__ */
 
 #define VCMD_vx_info           VC_CMD(VINFO, 5, 0)
 
@@ -19,10 +15,14 @@ struct      vcmd_vx_info_v0 {
        /* more to come */
 };
 
-#ifdef __KERNEL__
-extern int vc_vx_info(uint32_t, void __user *);
 
-#endif /* __KERNEL__ */
+#define VCMD_ctx_stat          VC_CMD(VSTAT, 0, 0)
+
+struct vcmd_ctx_stat_v0 {
+       uint32_t usecnt;
+       uint32_t tasks;
+       /* more to come */
+};
 
 
 /* context commands */
@@ -34,13 +34,13 @@ struct      vcmd_ctx_create {
        uint64_t flagword;
 };
 
-#define VCMD_ctx_migrate       VC_CMD(PROCMIG, 1, 0)
+#define VCMD_ctx_migrate_v0    VC_CMD(PROCMIG, 1, 0)
+#define VCMD_ctx_migrate       VC_CMD(PROCMIG, 1, 1)
 
-#ifdef __KERNEL__
-extern int vc_ctx_create(uint32_t, void __user *);
-extern int vc_ctx_migrate(uint32_t, void __user *);
+struct vcmd_ctx_migrate {
+       uint64_t flagword;
+};
 
-#endif /* __KERNEL__ */
 
 
 /* flag commands */
@@ -53,17 +53,12 @@ struct      vcmd_ctx_flags_v0 {
        uint64_t mask;
 };
 
-#ifdef __KERNEL__
-extern int vc_get_cflags(uint32_t, void __user *);
-extern int vc_set_cflags(uint32_t, void __user *);
-
-#endif /* __KERNEL__ */
 
 
 /* context caps commands */
 
-#define VCMD_get_ccaps         VC_CMD(FLAGS, 3, 0)
-#define VCMD_set_ccaps         VC_CMD(FLAGS, 4, 0)
+#define VCMD_get_ccaps_v0      VC_CMD(FLAGS, 3, 0)
+#define VCMD_set_ccaps_v0      VC_CMD(FLAGS, 4, 0)
 
 struct vcmd_ctx_caps_v0 {
        uint64_t bcaps;
@@ -71,9 +66,24 @@ struct       vcmd_ctx_caps_v0 {
        uint64_t cmask;
 };
 
-#ifdef __KERNEL__
-extern int vc_get_ccaps(uint32_t, void __user *);
-extern int vc_set_ccaps(uint32_t, void __user *);
+#define VCMD_get_ccaps         VC_CMD(FLAGS, 3, 1)
+#define VCMD_set_ccaps         VC_CMD(FLAGS, 4, 1)
+
+struct vcmd_ctx_caps_v1 {
+       uint64_t ccaps;
+       uint64_t cmask;
+};
+
+
+
+/* bcaps commands */
+
+#define VCMD_get_bcaps         VC_CMD(FLAGS, 9, 0)
+#define VCMD_set_bcaps         VC_CMD(FLAGS,10, 0)
+
+struct vcmd_bcaps {
+       uint64_t bcaps;
+       uint64_t bmask;
+};
 
-#endif /* __KERNEL__ */
 #endif /* _VX_CONTEXT_CMD_H */