X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Fswitch.h;h=ee6defc57e2effd4986f6d2fdad6a8ec5b95bc5d;hb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;hp=0c7fddbf2746c7bab590a818f4165ab4edf6a417;hpb=2822ba293eb308225c50d346930c47bf98d9927b;p=util-vserver.git

diff --git a/kernel/switch.h b/kernel/switch.h
index 0c7fddb..ee6defc 100644
--- a/kernel/switch.h
+++ b/kernel/switch.h
@@ -3,11 +3,12 @@
 
 #include <linux/types.h>
 
+
 #define VC_CATEGORY(c)		(((c) >> 24) & 0x3F)
 #define VC_COMMAND(c)		(((c) >> 16) & 0xFF)
 #define VC_VERSION(c)		((c) & 0xFFF)
 
-#define VC_CMD(c,i,v)		((((VC_CAT_ ## c) & 0x3F) << 24) \
+#define VC_CMD(c, i, v)		((((VC_CAT_ ## c) & 0x3F) << 24) \
 				| (((i) & 0xFF) << 16) | ((v) & 0xFFF))
 
 /*
@@ -18,7 +19,7 @@
 	 |STATS  |DESTROY|ALTER  |CHANGE |LIMIT  |TEST   | |       |       |
 	 |INFO   |SETUP  |       |MOVE   |       |       | |       |       |
   -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
-  SYSTEM |VERSION|VSETUP |VHOST  |       |       |       | |DEVICES|       |
+  SYSTEM |VERSION|VSETUP |VHOST  |       |       |       | |DEVICE |       |
   HOST   |     00|     01|     02|     03|     04|     05| |     06|     07|
   -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
   CPU    |       |VPROC  |PROCALT|PROCMIG|PROCTRL|       | |SCHED. |       |
@@ -30,10 +31,10 @@
   NETWORK|       |VNET   |NETALT |NETMIG |NETCTL |       | |SERIAL |       |
 	 |     24|     25|     26|     27|     28|     29| |     30|     31|
   -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
-  DISK   |       |       |       |       |DLIMIT |       | |INODE  |       |
+  DISK   |       |       |       |TAGMIG |DLIMIT |       | |INODE  |       |
   VFS    |     32|     33|     34|     35|     36|     37| |     38|     39|
   -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
-  OTHER  |       |       |       |       |       |       | |VINFO  |       |
+  OTHER  |VSTAT  |       |       |       |       |       | |VINFO  |       |
 	 |     40|     41|     42|     43|     44|     45| |     46|     47|
   =======+=======+=======+=======+=======+=======+=======+ +=======+=======+
   SPECIAL|EVENT  |       |       |       |FLAGS  |       | |       |       |
@@ -50,6 +51,8 @@
 #define VC_CAT_VSETUP		1
 #define VC_CAT_VHOST		2
 
+#define VC_CAT_DEVICE		6
+
 #define VC_CAT_VPROC		9
 #define VC_CAT_PROCALT		10
 #define VC_CAT_PROCMIG		11
@@ -62,9 +65,11 @@
 #define VC_CAT_NETMIG		27
 #define VC_CAT_NETCTRL		28
 
+#define VC_CAT_TAGMIG		35
 #define VC_CAT_DLIMIT		36
 #define VC_CAT_INODE		38
 
+#define VC_CAT_VSTAT		40
 #define VC_CAT_VINFO		46
 #define VC_CAT_EVENT		48
 
@@ -75,23 +80,12 @@
 #define VC_CAT_SYSTEST		61
 #define VC_CAT_COMPAT		63
 
-/*  interface version */
-
-#define VCI_VERSION		0x00020001
-#define VCI_LEGACY_VERSION	0x000100FF
-
 /*  query version */
 
 #define VCMD_get_version	VC_CMD(VERSION, 0, 0)
+#define VCMD_get_vci		VC_CMD(VERSION, 1, 0)
 
 
-#ifdef	__KERNEL__
-
-#include <linux/errno.h>
-
-
-#else	/* __KERNEL__ */
 #define __user
-#endif	/* __KERNEL__ */
 
 #endif	/* _VX_SWITCH_H */