Changeset 2744
- Timestamp:
- 07/14/08 22:09:00 (4 months ago)
- Files:
-
- trunk/kernel/context_cmd.h (modified) (2 diffs)
- trunk/kernel/space_cmd.h (modified) (1 diff)
- trunk/lib/Makefile-files (modified) (1 diff)
- trunk/lib/syscall_ctxcreate-v21.hc (modified) (1 diff)
- trunk/lib/syscall_ctxcreate-v23.hc (added)
- trunk/lib/syscall_ctxcreate.c (modified) (1 diff)
- trunk/lib/syscall_ctxmigrate-v21.hc (modified) (1 diff)
- trunk/lib/syscall_ctxmigrate-v23.hc (added)
- trunk/lib/syscall_ctxmigrate.c (modified) (1 diff)
- trunk/lib/syscall_getspacedefault-v23.hc (added)
- trunk/lib/syscall_getspacedefault.c (added)
- trunk/lib/vserver-internal.h (modified) (1 diff)
- trunk/lib/vserver.h (modified) (1 diff)
- trunk/scripts/vserver.functions (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/kernel/context_cmd.h
r2619 r2744 29 29 30 30 #define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0) 31 #define VCMD_ctx_create VC_CMD(VPROC, 1, 1) 31 #define VCMD_ctx_create_v1 VC_CMD(VPROC, 1, 1) 32 #define VCMD_ctx_create VC_CMD(VPROC, 1, 2) 32 33 33 34 struct vcmd_ctx_create { … … 36 37 37 38 #define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0) 38 #define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1) 39 #define VCMD_ctx_migrate_v1 VC_CMD(PROCMIG, 1, 1) 40 #define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 2) 39 41 40 42 struct vcmd_ctx_migrate { trunk/kernel/space_cmd.h
r2413 r2744 14 14 #define VCMD_get_space_mask VC_CMD(PROCALT, 4, 0) 15 15 16 #define VCMD_get_space_default VC_CMD(PROCALT, 7, 0) 17 16 18 17 19 struct vcmd_space_mask { trunk/lib/Makefile-files
r2742 r2744 158 158 lib/syscall_getbadness-v23.hc \ 159 159 lib/syscall_setbadness.c \ 160 lib/syscall_setbadness-v23.hc 160 lib/syscall_setbadness-v23.hc \ 161 lib/syscall_ctxcreate-v23.hc \ 162 lib/syscall_ctxmigrate-v23.hc \ 163 lib/syscall_getspacedefault.c \ 164 lib/syscall_getspacedefault-v23.hc 161 165 162 166 if ENSC_HAVE_C99_COMPILER trunk/lib/syscall_ctxcreate-v21.hc
r2674 r2744 34 34 data.flagword = flags->flagword & flags->mask; 35 35 36 res = vserver(VCMD_ctx_create , CTX_USER2KERNEL(xid), &data);36 res = vserver(VCMD_ctx_create_v1, CTX_USER2KERNEL(xid), &data); 37 37 res = CTX_KERNEL2USER(res); 38 38 trunk/lib/syscall_ctxcreate.c
r2578 r2744 37 37 #endif 38 38 39 #if defined(VC_ENABLE_API_V23) 40 # include "syscall_ctxcreate-v23.hc" 41 #endif 42 39 43 #if defined(VC_ENABLE_API_V13) || defined(VC_ENABLE_API_V21) 40 44 xid_t 41 45 vc_ctx_create(xid_t xid, struct vc_ctx_flags *flags) 42 46 { 43 CALL_VC(CALL_VC_V21 (vc_ctx_create, xid, flags), 47 CALL_VC(CALL_VC_V23P(vc_ctx_create, xid, flags), 48 CALL_VC_V21 (vc_ctx_create, xid, flags), 44 49 CALL_VC_V13A(vc_ctx_create, xid, flags)); 45 50 } trunk/lib/syscall_ctxmigrate-v21.hc
r2501 r2744 35 35 } 36 36 37 return vserver(VCMD_ctx_migrate , CTX_USER2KERNEL(xid), &data);37 return vserver(VCMD_ctx_migrate_v1, CTX_USER2KERNEL(xid), &data); 38 38 } trunk/lib/syscall_ctxmigrate.c
r2501 r2744 37 37 #endif 38 38 39 #if defined(VC_ENABLE_API_V23) 40 # include "syscall_ctxmigrate-v23.hc" 41 #endif 42 39 43 #if defined(VC_ENABLE_API_V13) || defined(VC_ENABLE_API_V21) 40 44 int 41 45 vc_ctx_migrate(xid_t xid, uint_least64_t flags) 42 46 { 43 CALL_VC(CALL_VC_SPACES(vc_ctx_migrate, xid, flags), 47 CALL_VC(CALL_VC_V23P (vc_ctx_migrate, xid, flags), 48 CALL_VC_SPACES(vc_ctx_migrate, xid, flags), 44 49 CALL_VC_V13A (vc_ctx_migrate, xid)); 45 50 } trunk/lib/vserver-internal.h
r2589 r2744 137 137 #else 138 138 # define CALL_VC_V23(F,...) CALL_VC_NOOP 139 #endif 140 141 #ifdef VC_ENABLE_API_V23 142 # define CALL_VC_V23P(F,...) CALL_VC_GENERAL(0x00020303, v23, F, __VA_ARGS__) 143 #else 144 # define CALL_VC_V23P(F,...) CALL_VC_NOOP 139 145 #endif 140 146 trunk/lib/vserver.h
r2741 r2744 764 764 int vc_enter_namespace(xid_t xid, uint_least64_t mask); 765 765 int vc_set_namespace(xid_t xid, uint_least64_t mask); 766 int vc_cleanup_namespace(); 767 uint_least64_t vc_get_space_mask(); 766 int vc_cleanup_namespace(void); 767 uint_least64_t vc_get_space_mask(void); 768 uint_least64_t vc_get_space_default(void); 768 769 769 770 trunk/scripts/vserver.functions
r2736 r2744 770 770 local d="$vdir"/spaces 771 771 772 ( test ! -e "$d"/pid && 773 ! $_VSERVER_INFO PIDSPACE FEATURE ) || \ 772 ( test ! -e "$d"/pid ) || \ 774 773 OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --pid ) 775 774
