From: Enrico Scholz Date: Thu, 22 Apr 2004 15:43:30 +0000 (+0000) Subject: use more specific names for the flags X-Git-Tag: VERSION_0_10~92 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3f32cef24ab2e6127b3e8cf4f8384db57f432af;p=util-vserver.git use more specific names for the flags git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1491 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/lib/cflags-v13.c b/util-vserver/lib/cflags-v13.c index 754e42b..e6e4649 100644 --- a/util-vserver/lib/cflags-v13.c +++ b/util-vserver/lib/cflags-v13.c @@ -30,28 +30,28 @@ #define DECL(STR, VAL) { STR, sizeof(STR)-1, VAL } static struct Mapping_uint64 const VALUES[] = { - DECL("lock", VC_VXF_INFO_LOCK), - DECL("nproc", VC_VXF_INFO_NPROC), - DECL("private", VC_VXF_INFO_PRIVATE), - DECL("fakeinit", VC_VXF_INFO_INIT), + DECL("lock", VC_VXF_INFO_LOCK), + DECL("nproc", VC_VXF_INFO_NPROC), + DECL("private", VC_VXF_INFO_PRIVATE), + DECL("fakeinit", VC_VXF_INFO_INIT), - DECL("hideinfo", VC_VXF_INFO_HIDEINFO), - DECL("ulimit", VC_VXF_INFO_ULIMIT), - DECL("namespace", VC_VXF_INFO_NAMESPACE), + DECL("hideinfo", VC_VXF_INFO_HIDEINFO), + DECL("ulimit", VC_VXF_INFO_ULIMIT), + DECL("namespace", VC_VXF_INFO_NAMESPACE), - DECL("hard", VC_VXF_SCHED_HARD), - DECL("prio", VC_VXF_SCHED_PRIO), - DECL("pause", VC_VXF_SCHED_PAUSE), + DECL("sched_hard", VC_VXF_SCHED_HARD), + DECL("sched_prio", VC_VXF_SCHED_PRIO), + DECL("sched_pause", VC_VXF_SCHED_PAUSE), - DECL("mem", VC_VXF_VIRT_MEM), - DECL("uptime", VC_VXF_VIRT_UPTIME), - DECL("cpu", VC_VXF_VIRT_CPU), + DECL("virt_mem", VC_VXF_VIRT_MEM), + DECL("virt_uptime", VC_VXF_VIRT_UPTIME), + DECL("virt_cpu", VC_VXF_VIRT_CPU), - DECL("hidemount", VC_VXF_HIDE_MOUNT), - DECL("hidenetif", VC_VXF_HIDE_NETIF), + DECL("hide_mount", VC_VXF_HIDE_MOUNT), + DECL("hide_netif", VC_VXF_HIDE_NETIF), - DECL("setup", VC_VXF_STATE_SETUP), - DECL("init", VC_VXF_STATE_INIT), + DECL("state_setup", VC_VXF_STATE_SETUP), + DECL("state_init", VC_VXF_STATE_INIT), }; uint_least64_t diff --git a/util-vserver/lib/testsuite/cflags.c b/util-vserver/lib/testsuite/cflags.c index b929c17..e632904 100644 --- a/util-vserver/lib/testsuite/cflags.c +++ b/util-vserver/lib/testsuite/cflags.c @@ -133,7 +133,10 @@ int main() TEST_LIST("^4,~^2", 0, 0, 0x10, 0x14, -1,0); - TEST_LIST("lock,nproc,private,fakeinit,hideinfo,ulimit,namespace,hard,prio,pause,mem,uptime,cpu,hidemount,hidenetif,setup,init", + TEST_LIST("lock,nproc,private,fakeinit,hideinfo,ulimit,namespace," + "sched_hard,sched_prio,sched_pause," + "virt_mem,virt_uptime,virt_cpu," + "hide_mount,hide_netif,state_setup,state_init", 0, 0, VC_VXF_INFO_LOCK|VC_VXF_INFO_NPROC|VC_VXF_INFO_PRIVATE|VC_VXF_INFO_INIT| VC_VXF_INFO_HIDEINFO|VC_VXF_INFO_ULIMIT|VC_VXF_INFO_NAMESPACE| @@ -151,7 +154,10 @@ int main() -1,0); - TEST_LIST("~lock,~nproc,~private,~fakeinit,~hideinfo,~ulimit,~namespace,~hard,~prio,~pause,~mem,~uptime,~cpu,~hidemount,~hidenetif,~setup,~init", + TEST_LIST("~lock,~nproc,~private,~fakeinit,~hideinfo,~ulimit,~namespace," + "~sched_hard,~sched_prio,~sched_pause," + "~virt_mem,~virt_uptime,~virt_cpu," + "~hide_mount,~hide_netif,~state_setup,~state_init", 0, 0, 0, VC_VXF_INFO_LOCK|VC_VXF_INFO_NPROC|VC_VXF_INFO_PRIVATE|VC_VXF_INFO_INIT|