X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fswitch.h;h=c3c06039a33d89464790fb1f5a328cfee30f504b;hb=HEAD;hp=672ed15f60422e6b6366266f30a438963183a8e6;hpb=52ab297203286190e6eff8a0675967a42c5b20f2;p=util-vserver.git diff --git a/kernel/switch.h b/kernel/switch.h index 672ed15..c3c0603 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,25 +19,25 @@ |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. | | PROCESS| 08| 09| 10| 11| 12| 13| | 14| 15| -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ - MEMORY | | | | | | | |SWAP | | + MEMORY | | | | |MEMCTRL| | |SWAP | | | 16| 17| 18| 19| 20| 21| | 22| 23| -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ 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 |VSTAT | | | | | | |VINFO | | | 40| 41| 42| 43| 44| 45| | 46| 47| =======+=======+=======+=======+=======+=======+=======+ +=======+=======+ - SPECIAL|EVENT | | | |FLAGS | | | | | + SPECIAL|EVENT | | | |FLAGS | | |VSPACE | | | 48| 49| 50| 51| 52| 53| | 54| 55| -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ SPECIAL|DEBUG | | | |RLIMIT |SYSCALL| | |COMPAT | @@ -51,18 +51,22 @@ #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 #define VC_CAT_PROCTRL 12 #define VC_CAT_SCHED 14 +#define VC_CAT_MEMCTRL 20 #define VC_CAT_VNET 25 #define VC_CAT_NETALT 26 #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 @@ -71,17 +75,13 @@ #define VC_CAT_EVENT 48 #define VC_CAT_FLAGS 52 +#define VC_CAT_VSPACE 54 #define VC_CAT_DEBUG 56 #define VC_CAT_RLIMIT 60 #define VC_CAT_SYSTEST 61 #define VC_CAT_COMPAT 63 -/* interface version */ - -#define VCI_VERSION 0x00020102 -#define VCI_LEGACY_VERSION 0x000100FF - /* query version */ #define VCMD_get_version VC_CMD(VERSION, 0, 0)