merge with 0.30.213

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

diff --git a/kernel/cvirt_cmd.h b/kernel/cvirt_cmd.h
index 3260b9f..73b72c1 100644 (file)
--- a/kernel/cvirt_cmd.h
+++ b/kernel/cvirt_cmd.h
@@ -1,6 +1,7 @@
 #ifndef _VX_CVIRT_CMD_H
 #define _VX_CVIRT_CMD_H
 
+
 /* virtual host info name commands */
 
 #define VCMD_set_vhi_name      VC_CMD(VHOST, 1, 0)
@@ -23,12 +24,18 @@ enum vhi_name_field {
 };
 
 
-#ifdef __KERNEL__
 
-#include <linux/compiler.h>
+#define VCMD_virt_stat         VC_CMD(VSTAT, 3, 0)
 
-extern int vc_set_vhi_name(uint32_t, void __user *);
-extern int vc_get_vhi_name(uint32_t, void __user *);
+struct vcmd_virt_stat_v0 {
+       uint64_t offset;
+       uint64_t uptime;
+       uint32_t nr_threads;
+       uint32_t nr_running;
+       uint32_t nr_uninterruptible;
+       uint32_t nr_onhold;
+       uint32_t nr_forks;
+       uint32_t load[3];
+};
 
-#endif /* __KERNEL__ */
 #endif /* _VX_CVIRT_CMD_H */