sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-01-11 18:33:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed target symbol parsing in pre-typed capabilities

Browse Source 
Also renamed CONT to CONTAINER on certain symbols
This commit is contained in:
Bahadir Balban
2009-11-17 12:34:59 +02:00
parent 8856609896
commit b933db1e36
3 changed files with 78 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/caps.py
View File

@@ -196,16 +196,20 @@ def prepare_typed_capability(cont, param, val):
elif 'TARGET' in params:
# Get reference to capability string template
templ = Template(cont.caps[captype])
target, ttype = params.split('_', 1)
# Two types of strings are expected here: TARGET or TARGET_TARGETTYPE
# If TARGET, the corresponding value is in val
target_parts = params.split('_', 1)
# Target type
if ttype != None:
if len(target_parts) == 2:
ttype = target_parts[1]
# Insert current container id, if target has current
if ttype[:len('CURRENT')] == 'CURRENT':
cont.caps[captype] = templ.safe_substitute(target_type = ttype, cid = cont.id)
else:
cont.caps[captype] = templ.safe_substitute(target_type = ttype)
# Get target value supplied by user
# Get target value supplied by user in val
else:
cont.caps[captype] = templ.safe_substitute(cid = val)

138
config/cml/container_ruleset.template
View File

@@ -240,128 +240,128 @@ default CONT%(cn)d_CAP_CUSTOM3_USE from n
menu cont%(cn)d_cap_custom0
CONT%(cn)d_CAP_CUSTOM0_USE
cont%(cn)d_cap_custom0_type
CONT%(cn)d_CAP_CUSTOM0_TARGET_CURRENT_CONT
CONT%(cn)d_CAP_CUSTOM0_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_CUSTOM0_TARGET_CURRENT_PAGER_SPACE
CONT%(cn)d_CAP_CUSTOM0_TARGET_ANOTHER_CONT
CONT%(cn)d_CAP_CUSTOM0_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_CUSTOM0_TARGET_ANOTHER_PAGER
CONT%(cn)d_CAP_CUSTOM0_TARGET%
menu cont%(cn)d_cap_custom1
CONT%(cn)d_CAP_CUSTOM1_USE
cont%(cn)d_cap_custom1_type
CONT%(cn)d_CAP_CUSTOM1_TARGET_CURRENT_CONT
CONT%(cn)d_CAP_CUSTOM1_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_CUSTOM1_TARGET_CURRENT_PAGER_SPACE
CONT%(cn)d_CAP_CUSTOM1_TARGET_ANOTHER_CONT
CONT%(cn)d_CAP_CUSTOM1_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_CUSTOM1_TARGET_ANOTHER_PAGER
CONT%(cn)d_CAP_CUSTOM1_TARGET%
menu cont%(cn)d_cap_custom2
CONT%(cn)d_CAP_CUSTOM2_USE
cont%(cn)d_cap_custom2_type
CONT%(cn)d_CAP_CUSTOM2_TARGET_CURRENT_CONT
CONT%(cn)d_CAP_CUSTOM2_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_CUSTOM2_TARGET_CURRENT_PAGER_SPACE
CONT%(cn)d_CAP_CUSTOM2_TARGET_ANOTHER_CONT
CONT%(cn)d_CAP_CUSTOM2_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_CUSTOM2_TARGET_ANOTHER_PAGER
CONT%(cn)d_CAP_CUSTOM2_TARGET%
menu cont%(cn)d_cap_custom3
CONT%(cn)d_CAP_CUSTOM3_USE
cont%(cn)d_cap_custom3_type
CONT%(cn)d_CAP_CUSTOM3_TARGET_CURRENT_CONT
CONT%(cn)d_CAP_CUSTOM3_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_CUSTOM3_TARGET_CURRENT_PAGER_SPACE
CONT%(cn)d_CAP_CUSTOM3_TARGET_ANOTHER_CONT
CONT%(cn)d_CAP_CUSTOM3_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_CUSTOM3_TARGET_ANOTHER_PAGER
CONT%(cn)d_CAP_CUSTOM3_TARGET%
choicegroup CONT%(cn)d_CAP_CUSTOM0_TARGET_CURRENT_CONT
CONT%(cn)d_CAP_CUSTOM0_TARGET_ANOTHER_CONT
choicegroup CONT%(cn)d_CAP_CUSTOM0_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_CUSTOM0_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_CUSTOM0_TARGET_CURRENT_PAGER_SPACE
CONT%(cn)d_CAP_CUSTOM0_TARGET_ANOTHER_PAGER
default CONT%(cn)d_CAP_CUSTOM0_TARGET_CURRENT_CONT from y
default CONT%(cn)d_CAP_CUSTOM0_TARGET_CURRENT_CONTAINER from y
choicegroup CONT%(cn)d_CAP_CUSTOM1_TARGET_CURRENT_CONT
CONT%(cn)d_CAP_CUSTOM1_TARGET_ANOTHER_CONT
choicegroup CONT%(cn)d_CAP_CUSTOM1_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_CUSTOM1_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_CUSTOM1_TARGET_CURRENT_PAGER_SPACE
CONT%(cn)d_CAP_CUSTOM1_TARGET_ANOTHER_PAGER
default CONT%(cn)d_CAP_CUSTOM1_TARGET_CURRENT_CONT from y
default CONT%(cn)d_CAP_CUSTOM1_TARGET_CURRENT_CONTAINER from y
choicegroup CONT%(cn)d_CAP_CUSTOM2_TARGET_CURRENT_CONT
CONT%(cn)d_CAP_CUSTOM2_TARGET_ANOTHER_CONT
choicegroup CONT%(cn)d_CAP_CUSTOM2_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_CUSTOM2_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_CUSTOM2_TARGET_CURRENT_PAGER_SPACE
CONT%(cn)d_CAP_CUSTOM2_TARGET_ANOTHER_PAGER
default CONT%(cn)d_CAP_CUSTOM2_TARGET_CURRENT_CONT from y
default CONT%(cn)d_CAP_CUSTOM2_TARGET_CURRENT_CONTAINER from y
choicegroup CONT%(cn)d_CAP_CUSTOM3_TARGET_CURRENT_CONT
CONT%(cn)d_CAP_CUSTOM3_TARGET_ANOTHER_CONT
choicegroup CONT%(cn)d_CAP_CUSTOM3_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_CUSTOM3_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_CUSTOM3_TARGET_CURRENT_PAGER_SPACE
CONT%(cn)d_CAP_CUSTOM3_TARGET_ANOTHER_PAGER
default CONT%(cn)d_CAP_CUSTOM3_TARGET_CURRENT_CONT from y
default CONT%(cn)d_CAP_CUSTOM3_TARGET_CURRENT_CONTAINER from y
when CONT%(cn)d_CAP_CUSTOM0_USE == n
suppress cont%(cn)d_cap_custom0_type
CONT%(cn)d_CAP_CUSTOM0_TARGET_CURRENT_CONT
CONT%(cn)d_CAP_CUSTOM0_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_CUSTOM0_TARGET_CURRENT_PAGER_SPACE
CONT%(cn)d_CAP_CUSTOM0_TARGET_ANOTHER_CONT
CONT%(cn)d_CAP_CUSTOM0_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_CUSTOM0_TARGET_ANOTHER_PAGER
CONT%(cn)d_CAP_CUSTOM0_TARGET
when CONT%(cn)d_CAP_CUSTOM1_USE == n
suppress cont%(cn)d_cap_custom1_type
CONT%(cn)d_CAP_CUSTOM1_TARGET_CURRENT_CONT
CONT%(cn)d_CAP_CUSTOM1_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_CUSTOM1_TARGET_CURRENT_PAGER_SPACE
CONT%(cn)d_CAP_CUSTOM1_TARGET_ANOTHER_CONT
CONT%(cn)d_CAP_CUSTOM1_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_CUSTOM1_TARGET_ANOTHER_PAGER
CONT%(cn)d_CAP_CUSTOM1_TARGET
when CONT%(cn)d_CAP_CUSTOM2_USE == n
suppress cont%(cn)d_cap_custom2_type
CONT%(cn)d_CAP_CUSTOM2_TARGET_CURRENT_CONT
CONT%(cn)d_CAP_CUSTOM2_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_CUSTOM2_TARGET_CURRENT_PAGER_SPACE
CONT%(cn)d_CAP_CUSTOM2_TARGET_ANOTHER_CONT
CONT%(cn)d_CAP_CUSTOM2_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_CUSTOM2_TARGET_ANOTHER_PAGER
CONT%(cn)d_CAP_CUSTOM2_TARGET
when CONT%(cn)d_CAP_CUSTOM3_USE == n
suppress cont%(cn)d_cap_custom3_type
CONT%(cn)d_CAP_CUSTOM3_TARGET_CURRENT_CONT
CONT%(cn)d_CAP_CUSTOM3_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_CUSTOM3_TARGET_CURRENT_PAGER_SPACE
CONT%(cn)d_CAP_CUSTOM3_TARGET_ANOTHER_CONT
CONT%(cn)d_CAP_CUSTOM3_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_CUSTOM3_TARGET_ANOTHER_PAGER
CONT%(cn)d_CAP_CUSTOM3_TARGET
when CONT%(cn)d_CAP_CUSTOM0_IPC_TYPE == n
suppress CONT%(cn)d_CAP_CUSTOM0_TARGET_ANOTHER_CONT
suppress CONT%(cn)d_CAP_CUSTOM0_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_CUSTOM0_TARGET_ANOTHER_PAGER
CONT%(cn)d_CAP_CUSTOM0_TARGET
when CONT%(cn)d_CAP_CUSTOM0_TARGET_CURRENT_CONT or
when CONT%(cn)d_CAP_CUSTOM0_TARGET_CURRENT_CONTAINER or
CONT%(cn)d_CAP_CUSTOM0_TARGET_CURRENT_PAGER_SPACE
suppress CONT%(cn)d_CAP_CUSTOM0_TARGET
when CONT%(cn)d_CAP_CUSTOM1_IPC_TYPE == n
suppress CONT%(cn)d_CAP_CUSTOM1_TARGET_ANOTHER_CONT
suppress CONT%(cn)d_CAP_CUSTOM1_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_CUSTOM1_TARGET_ANOTHER_PAGER
CONT%(cn)d_CAP_CUSTOM1_TARGET
when CONT%(cn)d_CAP_CUSTOM1_TARGET_CURRENT_CONT or
when CONT%(cn)d_CAP_CUSTOM1_TARGET_CURRENT_CONTAINER or
CONT%(cn)d_CAP_CUSTOM1_TARGET_CURRENT_PAGER_SPACE
suppress CONT%(cn)d_CAP_CUSTOM1_TARGET
when CONT%(cn)d_CAP_CUSTOM2_IPC_TYPE == n
suppress CONT%(cn)d_CAP_CUSTOM2_TARGET_ANOTHER_CONT
suppress CONT%(cn)d_CAP_CUSTOM2_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_CUSTOM2_TARGET_ANOTHER_PAGER
CONT%(cn)d_CAP_CUSTOM2_TARGET
when CONT%(cn)d_CAP_CUSTOM2_TARGET_CURRENT_CONT or
when CONT%(cn)d_CAP_CUSTOM2_TARGET_CURRENT_CONTAINER or
CONT%(cn)d_CAP_CUSTOM2_TARGET_CURRENT_PAGER_SPACE
suppress CONT%(cn)d_CAP_CUSTOM2_TARGET
when CONT%(cn)d_CAP_CUSTOM3_IPC_TYPE == n
suppress CONT%(cn)d_CAP_CUSTOM3_TARGET_ANOTHER_CONT
suppress CONT%(cn)d_CAP_CUSTOM3_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_CUSTOM3_TARGET_ANOTHER_PAGER
CONT%(cn)d_CAP_CUSTOM3_TARGET
when CONT%(cn)d_CAP_CUSTOM3_TARGET_CURRENT_CONT or
when CONT%(cn)d_CAP_CUSTOM3_TARGET_CURRENT_CONTAINER or
CONT%(cn)d_CAP_CUSTOM3_TARGET_CURRENT_PAGER_SPACE
suppress CONT%(cn)d_CAP_CUSTOM3_TARGET
@@ -378,9 +378,9 @@ CONT%(cn)d_CAP_CUSTOM0_IPC_TYPE 'IPC Capability'
CONT%(cn)d_CAP_CUSTOM0_TCTRL_TYPE 'Thread Control Capability'
CONT%(cn)d_CAP_CUSTOM0_EXREGS_TYPE 'Exchange Registers Capability'
CONT%(cn)d_CAP_CUSTOM0_CAPCTRL_TYPE 'Capability Control Capability'
CONT%(cn)d_CAP_CUSTOM0_TARGET_CURRENT_CONT 'Capability Targets Current Container'
CONT%(cn)d_CAP_CUSTOM0_TARGET_CURRENT_CONTAINER 'Capability Targets Current Container'
CONT%(cn)d_CAP_CUSTOM0_TARGET_CURRENT_PAGER_SPACE 'Capability Targets Current Pager`s Space'
CONT%(cn)d_CAP_CUSTOM0_TARGET_ANOTHER_CONT 'Capability Targets Another Container'
CONT%(cn)d_CAP_CUSTOM0_TARGET_ANOTHER_CONTAINER 'Capability Targets Another Container'
CONT%(cn)d_CAP_CUSTOM0_TARGET_ANOTHER_PAGER 'Capability Targets Another Container`s Pager'
CONT%(cn)d_CAP_CUSTOM0_TARGET 'Enter Container ID'
@@ -390,9 +390,9 @@ CONT%(cn)d_CAP_CUSTOM1_IPC_TYPE 'IPC Capability'
CONT%(cn)d_CAP_CUSTOM1_TCTRL_TYPE 'Thread Control Capability'
CONT%(cn)d_CAP_CUSTOM1_EXREGS_TYPE 'Exchange Registers Capability'
CONT%(cn)d_CAP_CUSTOM1_CAPCTRL_TYPE 'Capability Control Capability'
CONT%(cn)d_CAP_CUSTOM1_TARGET_CURRENT_CONT 'Capability Targets Current Container'
CONT%(cn)d_CAP_CUSTOM1_TARGET_CURRENT_CONTAINER 'Capability Targets Current Container'
CONT%(cn)d_CAP_CUSTOM1_TARGET_CURRENT_PAGER_SPACE 'Capability Targets Current Pager`s Space'
CONT%(cn)d_CAP_CUSTOM1_TARGET_ANOTHER_CONT 'Capability Targets Another Container'
CONT%(cn)d_CAP_CUSTOM1_TARGET_ANOTHER_CONTAINER 'Capability Targets Another Container'
CONT%(cn)d_CAP_CUSTOM1_TARGET_ANOTHER_PAGER 'Capability Targets Another Container`s Pager'
CONT%(cn)d_CAP_CUSTOM1_TARGET 'Enter Container ID'
@@ -402,9 +402,9 @@ CONT%(cn)d_CAP_CUSTOM2_IPC_TYPE 'IPC Capability'
CONT%(cn)d_CAP_CUSTOM2_TCTRL_TYPE 'Thread Control Capability'
CONT%(cn)d_CAP_CUSTOM2_EXREGS_TYPE 'Exchange Registers Capability'
CONT%(cn)d_CAP_CUSTOM2_CAPCTRL_TYPE 'Capability Control Capability'
CONT%(cn)d_CAP_CUSTOM2_TARGET_CURRENT_CONT 'Capability Targets Current Container'
CONT%(cn)d_CAP_CUSTOM2_TARGET_CURRENT_CONTAINER 'Capability Targets Current Container'
CONT%(cn)d_CAP_CUSTOM2_TARGET_CURRENT_PAGER_SPACE 'Capability Targets Current Pager`s Space'
CONT%(cn)d_CAP_CUSTOM2_TARGET_ANOTHER_CONT 'Capability Targets Another Container'
CONT%(cn)d_CAP_CUSTOM2_TARGET_ANOTHER_CONTAINER 'Capability Targets Another Container'
CONT%(cn)d_CAP_CUSTOM2_TARGET_ANOTHER_PAGER 'Capability Targets Another Container`s Pager'
CONT%(cn)d_CAP_CUSTOM2_TARGET 'Enter Container ID'
@@ -414,9 +414,9 @@ CONT%(cn)d_CAP_CUSTOM3_IPC_TYPE 'IPC Capability'
CONT%(cn)d_CAP_CUSTOM3_TCTRL_TYPE 'Thread Control Capability'
CONT%(cn)d_CAP_CUSTOM3_EXREGS_TYPE 'Exchange Registers Capability'
CONT%(cn)d_CAP_CUSTOM3_CAPCTRL_TYPE 'Capability Control Capability'
CONT%(cn)d_CAP_CUSTOM3_TARGET_CURRENT_CONT 'Capability Targets Current Container'
CONT%(cn)d_CAP_CUSTOM3_TARGET_CURRENT_CONTAINER 'Capability Targets Current Container'
CONT%(cn)d_CAP_CUSTOM3_TARGET_CURRENT_PAGER_SPACE 'Capability Targets Current Pager`s Space'
CONT%(cn)d_CAP_CUSTOM3_TARGET_ANOTHER_CONT 'Capability Targets Another Container'
CONT%(cn)d_CAP_CUSTOM3_TARGET_ANOTHER_CONTAINER 'Capability Targets Another Container'
CONT%(cn)d_CAP_CUSTOM3_TARGET_ANOTHER_PAGER 'Capability Targets Another Container`s Pager'
CONT%(cn)d_CAP_CUSTOM3_TARGET 'Enter Container ID'
@@ -425,23 +425,23 @@ CONT%(cn)d_CAP_CUSTOM3_TARGET 'Enter Container ID'
# Symbols for Generic Capabilities
symbols
CONT%(cn)d_CAP_TCTRL_USE 'Enable this Capability'
CONT%(cn)d_CAP_TCTRL_TARGET_CURRENT_CONT 'Capability Targets Current Container'
CONT%(cn)d_CAP_TCTRL_TARGET_CURRENT_CONTAINER 'Capability Targets Current Container'
CONT%(cn)d_CAP_TCTRL_TARGET_CURRENT_PAGER_SPACE 'Capability Targets Current Pager`s Space'
CONT%(cn)d_CAP_EXREGS_USE 'Enable this Capability'
CONT%(cn)d_CAP_EXREGS_TARGET_CURRENT_CONT 'Capability Targets Current Container'
CONT%(cn)d_CAP_EXREGS_TARGET_CURRENT_CONTAINER 'Capability Targets Current Container'
CONT%(cn)d_CAP_EXREGS_TARGET_CURRENT_PAGER_SPACE 'Capability Targets Current Pager`s Space'
CONT%(cn)d_CAP_IPC_USE 'Enable this Capability'
CONT%(cn)d_CAP_IPC_TARGET_CURRENT_CONT 'Capability Targets Current Container'
CONT%(cn)d_CAP_IPC_TARGET_CURRENT_CONTAINER 'Capability Targets Current Container'
CONT%(cn)d_CAP_IPC_TARGET_CURRENT_PAGER_SPACE 'Capability Targets Current Pager`s Space'
CONT%(cn)d_CAP_IPC_TARGET_ANOTHER_CONT 'Capability Targets Another Container'
CONT%(cn)d_CAP_IPC_TARGET_ANOTHER_CONTAINER 'Capability Targets Another Container'
CONT%(cn)d_CAP_IPC_TARGET_ANOTHER_PAGER 'Capability Targets Another Container`s Pager'
CONT%(cn)d_CAP_IPC_TARGET 'Enter Container ID'
symbols
CONT%(cn)d_CAP_CAPCTRL_USE 'Enable this Capability'
CONT%(cn)d_CAP_CAPCTRL_TARGET_CURRENT_CONT 'Capability Targets Current Container'
CONT%(cn)d_CAP_CAPCTRL_TARGET_CURRENT_CONTAINER 'Capability Targets Current Container'
CONT%(cn)d_CAP_CAPCTRL_TARGET_CURRENT_PAGER_SPACE 'Capability Targets Current Pager`s Space'
@@ -498,44 +498,44 @@ when CONT%(cn)d_CAP_CAPPOOL_USE == n
suppress CONT%(cn)d_CAP_CAPPOOL_SIZE
when CONT%(cn)d_CAP_IPC_USE == n
suppress CONT%(cn)d_CAP_IPC_TARGET_CURRENT_CONT
suppress CONT%(cn)d_CAP_IPC_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_IPC_TARGET_CURRENT_PAGER_SPACE
CONT%(cn)d_CAP_IPC_TARGET_ANOTHER_CONT
CONT%(cn)d_CAP_IPC_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_IPC_TARGET_ANOTHER_PAGER
when CONT%(cn)d_CAP_EXREGS_USE == n
suppress CONT%(cn)d_CAP_EXREGS_TARGET_CURRENT_CONT
suppress CONT%(cn)d_CAP_EXREGS_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_EXREGS_TARGET_CURRENT_PAGER_SPACE
when CONT%(cn)d_CAP_TCTRL_USE == n
suppress CONT%(cn)d_CAP_TCTRL_TARGET_CURRENT_CONT
suppress CONT%(cn)d_CAP_TCTRL_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_TCTRL_TARGET_CURRENT_PAGER_SPACE
when CONT%(cn)d_CAP_CAPCTRL_USE == n
suppress CONT%(cn)d_CAP_CAPCTRL_TARGET_CURRENT_CONT
suppress CONT%(cn)d_CAP_CAPCTRL_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_CAPCTRL_TARGET_CURRENT_PAGER_SPACE
when CONT%(cn)d_CAP_IPC_TARGET_CURRENT_CONT or
when CONT%(cn)d_CAP_IPC_TARGET_CURRENT_CONTAINER or
CONT%(cn)d_CAP_IPC_TARGET_CURRENT_PAGER_SPACE
suppress CONT%(cn)d_CAP_IPC_TARGET
choicegroup CONT%(cn)d_CAP_IPC_TARGET_CURRENT_CONT
CONT%(cn)d_CAP_IPC_TARGET_ANOTHER_CONT
choicegroup CONT%(cn)d_CAP_IPC_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_IPC_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_IPC_TARGET_CURRENT_PAGER_SPACE
CONT%(cn)d_CAP_IPC_TARGET_ANOTHER_PAGER
default CONT%(cn)d_CAP_IPC_TARGET_CURRENT_CONT from y
default CONT%(cn)d_CAP_IPC_TARGET_CURRENT_CONTAINER from y
choicegroup CONT%(cn)d_CAP_EXREGS_TARGET_CURRENT_CONT
choicegroup CONT%(cn)d_CAP_EXREGS_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_EXREGS_TARGET_CURRENT_PAGER_SPACE
default CONT%(cn)d_CAP_EXREGS_TARGET_CURRENT_CONT from y
default CONT%(cn)d_CAP_EXREGS_TARGET_CURRENT_CONTAINER from y
choicegroup CONT%(cn)d_CAP_TCTRL_TARGET_CURRENT_CONT
choicegroup CONT%(cn)d_CAP_TCTRL_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_TCTRL_TARGET_CURRENT_PAGER_SPACE
default CONT%(cn)d_CAP_TCTRL_TARGET_CURRENT_CONT from y
default CONT%(cn)d_CAP_TCTRL_TARGET_CURRENT_CONTAINER from y
choicegroup CONT%(cn)d_CAP_CAPCTRL_TARGET_CURRENT_CONT
choicegroup CONT%(cn)d_CAP_CAPCTRL_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_CAPCTRL_TARGET_CURRENT_PAGER_SPACE
default CONT%(cn)d_CAP_CAPCTRL_TARGET_CURRENT_CONT from y
default CONT%(cn)d_CAP_CAPCTRL_TARGET_CURRENT_CONTAINER from y
default CONT%(cn)d_CAP_TCTRL_USE from y
default CONT%(cn)d_CAP_EXREGS_USE from y
@@ -547,24 +547,24 @@ default CONT%(cn)d_CAP_IPC_TARGET from 0
# Capability Menus
menu cont%(cn)d_cap_tctrl
CONT%(cn)d_CAP_TCTRL_USE
CONT%(cn)d_CAP_TCTRL_TARGET_CURRENT_CONT
CONT%(cn)d_CAP_TCTRL_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_TCTRL_TARGET_CURRENT_PAGER_SPACE
menu cont%(cn)d_cap_exregs
CONT%(cn)d_CAP_EXREGS_USE
CONT%(cn)d_CAP_EXREGS_TARGET_CURRENT_CONT
CONT%(cn)d_CAP_EXREGS_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_EXREGS_TARGET_CURRENT_PAGER_SPACE
menu cont%(cn)d_cap_capctrl
CONT%(cn)d_CAP_CAPCTRL_USE
CONT%(cn)d_CAP_CAPCTRL_TARGET_CURRENT_CONT
CONT%(cn)d_CAP_CAPCTRL_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_CAPCTRL_TARGET_CURRENT_PAGER_SPACE
menu cont%(cn)d_cap_ipc
CONT%(cn)d_CAP_IPC_USE
CONT%(cn)d_CAP_IPC_TARGET_CURRENT_CONT
CONT%(cn)d_CAP_IPC_TARGET_CURRENT_CONTAINER
CONT%(cn)d_CAP_IPC_TARGET_CURRENT_PAGER_SPACE
CONT%(cn)d_CAP_IPC_TARGET_ANOTHER_CONT
CONT%(cn)d_CAP_IPC_TARGET_ANOTHER_CONTAINER
CONT%(cn)d_CAP_IPC_TARGET_ANOTHER_PAGER
CONT%(cn)d_CAP_IPC_TARGET%

4
include/l4/generic/container.h
View File

@@ -54,13 +54,13 @@ struct container {
enum cinfo_target_type {
/* Current container as a whole */
CURRENT_CONT = 1,
CURRENT_CONTAINER = 1,
/* Current pager's address space */
CURRENT_PAGER_SPACE = 2,
/* Another container as a whole */
ANOTHER_CONT = 3,
ANOTHER_CONTAINER = 3,
/* Another container's pager as a thread */
ANOTHER_PAGER = 4,