From 01f3841dc726ece7cac0dc66e9e01aee6cca66d9 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 29 Oct 2005 10:31:42 +0000 Subject: [PATCH] include "virtual.h" instead of "linuxvirtual.h" git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2207 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/lib/getnbipv4root.c | 2 +- util-vserver/lib/getversion-internal.hc | 2 +- util-vserver/lib/isdynamicxid.c | 2 +- util-vserver/lib/syscall_adddlimit.c | 2 +- util-vserver/lib/syscall_cleanupnamespace.c | 2 +- util-vserver/lib/syscall_ctxcreate.c | 2 +- util-vserver/lib/syscall_ctxmigrate.c | 2 +- util-vserver/lib/syscall_enternamespace.c | 2 +- util-vserver/lib/syscall_getccaps.c | 2 +- util-vserver/lib/syscall_getcflags.c | 2 +- util-vserver/lib/syscall_getdlimit.c | 2 +- util-vserver/lib/syscall_getiattr.c | 2 +- util-vserver/lib/syscall_getncaps.c | 2 +- util-vserver/lib/syscall_getnflags.c | 2 +- util-vserver/lib/syscall_getnxinfo.c | 2 +- util-vserver/lib/syscall_gettasknid.c | 2 +- util-vserver/lib/syscall_gettaskxid.c | 2 +- util-vserver/lib/syscall_getvhiname.c | 2 +- util-vserver/lib/syscall_getvxinfo.c | 2 +- util-vserver/lib/syscall_kill.c | 2 +- util-vserver/lib/syscall_netadd.c | 2 +- util-vserver/lib/syscall_netcreate.c | 2 +- util-vserver/lib/syscall_netmigrate.c | 2 +- util-vserver/lib/syscall_netremove.c | 2 +- util-vserver/lib/syscall_remdlimit.c | 2 +- util-vserver/lib/syscall_rlimit.c | 2 +- util-vserver/lib/syscall_setccaps.c | 2 +- util-vserver/lib/syscall_setcflags.c | 2 +- util-vserver/lib/syscall_setdlimit.c | 2 +- util-vserver/lib/syscall_setiattr.c | 2 +- util-vserver/lib/syscall_setnamespace.c | 2 +- util-vserver/lib/syscall_setncaps.c | 2 +- util-vserver/lib/syscall_setnflags.c | 2 +- util-vserver/lib/syscall_setsched.c | 2 +- util-vserver/lib/syscall_setvhiname.c | 2 +- util-vserver/lib/syscall_waitexit.c | 2 +- util-vserver/src/vkill.c | 3 ++- 37 files changed, 38 insertions(+), 37 deletions(-) diff --git a/util-vserver/lib/getnbipv4root.c b/util-vserver/lib/getnbipv4root.c index 62e115e..0274700 100644 --- a/util-vserver/lib/getnbipv4root.c +++ b/util-vserver/lib/getnbipv4root.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" size_t vc_get_nb_ipv4root() diff --git a/util-vserver/lib/getversion-internal.hc b/util-vserver/lib/getversion-internal.hc index 2b04967..1ca4d5a 100644 --- a/util-vserver/lib/getversion-internal.hc +++ b/util-vserver/lib/getversion-internal.hc @@ -24,7 +24,7 @@ #endif #define _LINUX_TYPES_H 1 -#include "linuxvirtual.h" +#include "virtual.h" static inline ALWAYSINLINE UNUSED int vc_get_version_internal(int cat) diff --git a/util-vserver/lib/isdynamicxid.c b/util-vserver/lib/isdynamicxid.c index 084819a..f90cad4 100644 --- a/util-vserver/lib/isdynamicxid.c +++ b/util-vserver/lib/isdynamicxid.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" bool vc_is_dynamic_xid(xid_t xid) diff --git a/util-vserver/lib/syscall_adddlimit.c b/util-vserver/lib/syscall_adddlimit.c index e68ce7f..2dd0694 100644 --- a/util-vserver/lib/syscall_adddlimit.c +++ b/util-vserver/lib/syscall_adddlimit.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" #include "vserver-internal.h" diff --git a/util-vserver/lib/syscall_cleanupnamespace.c b/util-vserver/lib/syscall_cleanupnamespace.c index 0b7aff4..f329aa1 100644 --- a/util-vserver/lib/syscall_cleanupnamespace.c +++ b/util-vserver/lib/syscall_cleanupnamespace.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" #include "vserver-internal.h" diff --git a/util-vserver/lib/syscall_ctxcreate.c b/util-vserver/lib/syscall_ctxcreate.c index b175a0b..747546b 100644 --- a/util-vserver/lib/syscall_ctxcreate.c +++ b/util-vserver/lib/syscall_ctxcreate.c @@ -22,7 +22,7 @@ #include "vserver.h" #include "vserver-internal.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_V13) # include "syscall_ctxcreate-v13.hc" diff --git a/util-vserver/lib/syscall_ctxmigrate.c b/util-vserver/lib/syscall_ctxmigrate.c index d98da5c..30ddffa 100644 --- a/util-vserver/lib/syscall_ctxmigrate.c +++ b/util-vserver/lib/syscall_ctxmigrate.c @@ -22,7 +22,7 @@ #include "vserver.h" #include "vserver-internal.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_V13) # include "syscall_ctxmigrate-v13.hc" diff --git a/util-vserver/lib/syscall_enternamespace.c b/util-vserver/lib/syscall_enternamespace.c index ca4518c..25ea4da 100644 --- a/util-vserver/lib/syscall_enternamespace.c +++ b/util-vserver/lib/syscall_enternamespace.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" #include "vserver-internal.h" diff --git a/util-vserver/lib/syscall_getccaps.c b/util-vserver/lib/syscall_getccaps.c index e5f867e..7d72ab6 100644 --- a/util-vserver/lib/syscall_getccaps.c +++ b/util-vserver/lib/syscall_getccaps.c @@ -22,7 +22,7 @@ #include "vserver.h" #include "vserver-internal.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_V13) # include "syscall_getccaps-v13.hc" diff --git a/util-vserver/lib/syscall_getcflags.c b/util-vserver/lib/syscall_getcflags.c index 5f447a5..24bf3f8 100644 --- a/util-vserver/lib/syscall_getcflags.c +++ b/util-vserver/lib/syscall_getcflags.c @@ -22,7 +22,7 @@ #include "vserver.h" #include "vserver-internal.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_V13) # include "syscall_getcflags-v13.hc" diff --git a/util-vserver/lib/syscall_getdlimit.c b/util-vserver/lib/syscall_getdlimit.c index 6eba2a3..c019432 100644 --- a/util-vserver/lib/syscall_getdlimit.c +++ b/util-vserver/lib/syscall_getdlimit.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" #include "vserver-internal.h" diff --git a/util-vserver/lib/syscall_getiattr.c b/util-vserver/lib/syscall_getiattr.c index e63ddf0..885e6e4 100644 --- a/util-vserver/lib/syscall_getiattr.c +++ b/util-vserver/lib/syscall_getiattr.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_FSCOMPAT) && defined(VC_ENABLE_API_V13) # define VC_MULTIVERSION_SYSCALL 1 diff --git a/util-vserver/lib/syscall_getncaps.c b/util-vserver/lib/syscall_getncaps.c index 4c10553..45b8c47 100644 --- a/util-vserver/lib/syscall_getncaps.c +++ b/util-vserver/lib/syscall_getncaps.c @@ -22,7 +22,7 @@ #include "vserver.h" #include "vserver-internal.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_NET) # include "syscall_getncaps-net.hc" diff --git a/util-vserver/lib/syscall_getnflags.c b/util-vserver/lib/syscall_getnflags.c index 1deca24..505dd25 100644 --- a/util-vserver/lib/syscall_getnflags.c +++ b/util-vserver/lib/syscall_getnflags.c @@ -22,7 +22,7 @@ #include "vserver.h" #include "vserver-internal.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_NET) # include "syscall_getnflags-net.hc" diff --git a/util-vserver/lib/syscall_getnxinfo.c b/util-vserver/lib/syscall_getnxinfo.c index 27d6de1..5d17dcf 100644 --- a/util-vserver/lib/syscall_getnxinfo.c +++ b/util-vserver/lib/syscall_getnxinfo.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" #include "vserver-internal.h" #ifdef VC_ENABLE_API_NET diff --git a/util-vserver/lib/syscall_gettasknid.c b/util-vserver/lib/syscall_gettasknid.c index 3ee0666..0b0184e 100644 --- a/util-vserver/lib/syscall_gettasknid.c +++ b/util-vserver/lib/syscall_gettasknid.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" #include "vserver-internal.h" #ifdef VC_ENABLE_API_NET diff --git a/util-vserver/lib/syscall_gettaskxid.c b/util-vserver/lib/syscall_gettaskxid.c index e7b152c..7f67cff 100644 --- a/util-vserver/lib/syscall_gettaskxid.c +++ b/util-vserver/lib/syscall_gettaskxid.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_OLDPROC) && defined(VC_ENABLE_API_V13) # define VC_MULTIVERSION_SYSCALL 1 diff --git a/util-vserver/lib/syscall_getvhiname.c b/util-vserver/lib/syscall_getvhiname.c index 17f5cae..c454ce8 100644 --- a/util-vserver/lib/syscall_getvhiname.c +++ b/util-vserver/lib/syscall_getvhiname.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_OLDUTS) && defined(VC_ENABLE_API_V13) # define VC_MULTIVERSION_SYSCALL 1 diff --git a/util-vserver/lib/syscall_getvxinfo.c b/util-vserver/lib/syscall_getvxinfo.c index 78be327..0e72d77 100644 --- a/util-vserver/lib/syscall_getvxinfo.c +++ b/util-vserver/lib/syscall_getvxinfo.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_OLDPROC) && defined(VC_ENABLE_API_V13) # define VC_MULTIVERSION_SYSCALL 1 diff --git a/util-vserver/lib/syscall_kill.c b/util-vserver/lib/syscall_kill.c index 96a0046..719e9bd 100644 --- a/util-vserver/lib/syscall_kill.c +++ b/util-vserver/lib/syscall_kill.c @@ -22,7 +22,7 @@ #include "vserver.h" #include "vserver-internal.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_V11) || defined(VC_ENABLE_API_V13) # include "syscall_kill-v11.hc" diff --git a/util-vserver/lib/syscall_netadd.c b/util-vserver/lib/syscall_netadd.c index 1619e19..214c8e9 100644 --- a/util-vserver/lib/syscall_netadd.c +++ b/util-vserver/lib/syscall_netadd.c @@ -22,7 +22,7 @@ #include "vserver.h" #include "vserver-internal.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_NET) # include "syscall_netadd-net.hc" diff --git a/util-vserver/lib/syscall_netcreate.c b/util-vserver/lib/syscall_netcreate.c index c72e1b4..0504548 100644 --- a/util-vserver/lib/syscall_netcreate.c +++ b/util-vserver/lib/syscall_netcreate.c @@ -22,7 +22,7 @@ #include "vserver.h" #include "vserver-internal.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_NET) # include "syscall_netcreate-net.hc" diff --git a/util-vserver/lib/syscall_netmigrate.c b/util-vserver/lib/syscall_netmigrate.c index 0649636..1c9f2e4 100644 --- a/util-vserver/lib/syscall_netmigrate.c +++ b/util-vserver/lib/syscall_netmigrate.c @@ -22,7 +22,7 @@ #include "vserver.h" #include "vserver-internal.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_NET) # include "syscall_netmigrate-net.hc" diff --git a/util-vserver/lib/syscall_netremove.c b/util-vserver/lib/syscall_netremove.c index c588432..36840cb 100644 --- a/util-vserver/lib/syscall_netremove.c +++ b/util-vserver/lib/syscall_netremove.c @@ -22,7 +22,7 @@ #include "vserver.h" #include "vserver-internal.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_NET) # include "syscall_netremove-net.hc" diff --git a/util-vserver/lib/syscall_remdlimit.c b/util-vserver/lib/syscall_remdlimit.c index 61a1e86..80a6f95 100644 --- a/util-vserver/lib/syscall_remdlimit.c +++ b/util-vserver/lib/syscall_remdlimit.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" #include "vserver-internal.h" diff --git a/util-vserver/lib/syscall_rlimit.c b/util-vserver/lib/syscall_rlimit.c index c3f75a5..deebc1b 100644 --- a/util-vserver/lib/syscall_rlimit.c +++ b/util-vserver/lib/syscall_rlimit.c @@ -23,7 +23,7 @@ #include "vserver.h" #include "internal.h" -#include "linuxvirtual.h" +#include "virtual.h" #include "vserver-internal.h" diff --git a/util-vserver/lib/syscall_setccaps.c b/util-vserver/lib/syscall_setccaps.c index f8691df..1d4f69d 100644 --- a/util-vserver/lib/syscall_setccaps.c +++ b/util-vserver/lib/syscall_setccaps.c @@ -22,7 +22,7 @@ #include "vserver.h" #include "vserver-internal.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_V13) # include "syscall_setccaps-v13.hc" diff --git a/util-vserver/lib/syscall_setcflags.c b/util-vserver/lib/syscall_setcflags.c index baafcae..367a676 100644 --- a/util-vserver/lib/syscall_setcflags.c +++ b/util-vserver/lib/syscall_setcflags.c @@ -22,7 +22,7 @@ #include "vserver.h" #include "vserver-internal.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_V13) # include "syscall_setcflags-v13.hc" diff --git a/util-vserver/lib/syscall_setdlimit.c b/util-vserver/lib/syscall_setdlimit.c index d3a30c2..bb20475 100644 --- a/util-vserver/lib/syscall_setdlimit.c +++ b/util-vserver/lib/syscall_setdlimit.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" #include "vserver-internal.h" diff --git a/util-vserver/lib/syscall_setiattr.c b/util-vserver/lib/syscall_setiattr.c index 5c7a53c..7effd80 100644 --- a/util-vserver/lib/syscall_setiattr.c +++ b/util-vserver/lib/syscall_setiattr.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_FSCOMPAT) && defined(VC_ENABLE_API_V13) # define VC_MULTIVERSION_SYSCALL 1 diff --git a/util-vserver/lib/syscall_setnamespace.c b/util-vserver/lib/syscall_setnamespace.c index fc38889..a03998e 100644 --- a/util-vserver/lib/syscall_setnamespace.c +++ b/util-vserver/lib/syscall_setnamespace.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" #include "vserver-internal.h" diff --git a/util-vserver/lib/syscall_setncaps.c b/util-vserver/lib/syscall_setncaps.c index 3b67004..f310e71 100644 --- a/util-vserver/lib/syscall_setncaps.c +++ b/util-vserver/lib/syscall_setncaps.c @@ -22,7 +22,7 @@ #include "vserver.h" #include "vserver-internal.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_NET) # include "syscall_setncaps-net.hc" diff --git a/util-vserver/lib/syscall_setnflags.c b/util-vserver/lib/syscall_setnflags.c index df40f0c..e68f413 100644 --- a/util-vserver/lib/syscall_setnflags.c +++ b/util-vserver/lib/syscall_setnflags.c @@ -22,7 +22,7 @@ #include "vserver.h" #include "vserver-internal.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_NET) # include "syscall_setnflags-net.hc" diff --git a/util-vserver/lib/syscall_setsched.c b/util-vserver/lib/syscall_setsched.c index 94a6a9f..48b9603 100644 --- a/util-vserver/lib/syscall_setsched.c +++ b/util-vserver/lib/syscall_setsched.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" #define VC_MULTIVERSION_SYSCALL 1 #include "vserver-internal.h" diff --git a/util-vserver/lib/syscall_setvhiname.c b/util-vserver/lib/syscall_setvhiname.c index f00f20b..c638471 100644 --- a/util-vserver/lib/syscall_setvhiname.c +++ b/util-vserver/lib/syscall_setvhiname.c @@ -21,7 +21,7 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_OLDUTS) && defined(VC_ENABLE_API_V13) # define VC_MULTIVERSION_SYSCALL 1 diff --git a/util-vserver/lib/syscall_waitexit.c b/util-vserver/lib/syscall_waitexit.c index 1f20408..c5ddc37 100644 --- a/util-vserver/lib/syscall_waitexit.c +++ b/util-vserver/lib/syscall_waitexit.c @@ -22,7 +22,7 @@ #include "vserver.h" #include "vserver-internal.h" -#include "linuxvirtual.h" +#include "virtual.h" #if defined(VC_ENABLE_API_V13) # include "syscall_waitexit-v13.hc" diff --git a/util-vserver/src/vkill.c b/util-vserver/src/vkill.c index a95f8a7..11189e6 100644 --- a/util-vserver/src/vkill.c +++ b/util-vserver/src/vkill.c @@ -21,9 +21,10 @@ #endif #include "vserver.h" -#include "linuxvirtual.h" #include "util.h" +#include "lib/virtual.h" + #include #include #include -- 1.8.1.5