X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fswitch.h;h=ee6defc57e2effd4986f6d2fdad6a8ec5b95bc5d;hb=99d33f6844e093ed5119203557a606ce60f83de5;hp=b7e255e5c79d000f4bd437ddaedd8d0c6d357dd2;hpb=0cbf992ea2fb9e247615e94c29b2083032a32152;p=util-vserver.git diff --git a/kernel/switch.h b/kernel/switch.h index b7e255e..ee6defc 100644 --- a/kernel/switch.h +++ b/kernel/switch.h @@ -8,7 +8,7 @@ #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)) /* @@ -19,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. | | @@ -31,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 | | | | | @@ -51,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 @@ -63,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 @@ -76,23 +80,12 @@ #define VC_CAT_SYSTEST 61 #define VC_CAT_COMPAT 63 -/* interface version */ - -#define VCI_VERSION 0x00020002 -#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 - - -#else /* __KERNEL__ */ #define __user -#endif /* __KERNEL__ */ #endif /* _VX_SWITCH_H */