diff --git a/config/cml/container_ruleset.template b/config/cml/container_ruleset.template index 870b914..285dec6 100644 --- a/config/cml/container_ruleset.template +++ b/config/cml/container_ruleset.template @@ -33,7 +33,7 @@ CONT%(cn)d_VIRT5_END 'Container %(cn)d Virtual Region 5 End Address' CONT%(cn)d_PAGER_LMA 'Container %(cn)d Pager LMA' CONT%(cn)d_PAGER_VMA 'Container %(cn)d Pager VMA' -CONT%(cn)d_PAGER_SIZE 'Container %(cn)d Pager Initial Map Size (Optional)' +CONT%(cn)d_PAGER_MAPSIZE 'Container %(cn)d Pager Initial Map Size (Optional)' CONT%(cn)d_PAGER_SHM_START 'Container %(cn)d Shared Mappings Region Start' CONT%(cn)d_PAGER_SHM_END 'Container %(cn)d Shared Mappings Region End' CONT%(cn)d_PAGER_TASK_START 'Container %(cn)d Task Address Space Region Start' @@ -48,7 +48,7 @@ CONT%(cn)d_LINUX_MAPSIZE 'Container %(cn)d Linux Initial Kernel Map Size Paramet default CONT%(cn)d_PAGER_LMA from 0x0 default CONT%(cn)d_PAGER_VMA from 0x0 -default CONT%(cn)d_PAGER_SIZE from 0x0 +default CONT%(cn)d_PAGER_MAPSIZE from 0x0 default CONT%(cn)d_PAGER_SHM_START from 0x0 default CONT%(cn)d_PAGER_SHM_END from 0x0 default CONT%(cn)d_PAGER_TASK_START from 0x0 @@ -138,7 +138,7 @@ cont%(cn)d_posix_pager_params 'Container %(cn)d POSIX Pager Parameters' menu cont%(cn)d_bare_pager_params CONT%(cn)d_PAGER_LMA@ CONT%(cn)d_PAGER_VMA@ - CONT%(cn)d_PAGER_SIZE@ + CONT%(cn)d_PAGER_MAPSIZE@ menu cont%(cn)d_posix_pager_params CONT%(cn)d_PAGER_SHM_START@ diff --git a/config/configuration.py b/config/configuration.py index 4bd89b5..efbc704 100644 --- a/config/configuration.py +++ b/config/configuration.py @@ -137,7 +137,7 @@ class configuration: self.containers[id].pager_task_region_start = int(val, 0) elif param[:len("PAGER_TASK_END")] == "PAGER_TASK_END": self.containers[id].pager_task_region_end = int(val, 0) - elif param[:len("PAGER_SIZE")] == "PAGER_SIZE": + elif param[:len("PAGER_MAPSIZE")] == "PAGER_MAPSIZE": self.containers[id].pager_size = int(val, 0) elif param[:len("LINUX_MAPSIZE")] == "LINUX_MAPSIZE": self.containers[id].linux_mapsize = int(val, 0) diff --git a/scripts/kernel/generate_kernel_cinfo.py b/scripts/kernel/generate_kernel_cinfo.py index dcc9a54..c419c5f 100755 --- a/scripts/kernel/generate_kernel_cinfo.py +++ b/scripts/kernel/generate_kernel_cinfo.py @@ -63,7 +63,7 @@ pager_start = \ \t\t\t.start_address = (CONFIG_CONT%d_START_PC_ADDR), \t\t\t.pager_lma = __pfn(CONFIG_CONT%d_PAGER_LMA), \t\t\t.pager_vma = __pfn(CONFIG_CONT%d_PAGER_VMA), -\t\t\t.pager_size = __pfn(CONFIG_CONT%d_PAGER_SIZE), +\t\t\t.pager_size = __pfn(CONFIG_CONT%d_PAGER_MAPSIZE), \t\t\t.ncaps = %d, \t\t\t.caps = { ''' @@ -187,7 +187,7 @@ pager_ifdefs = \ CONFIG_CONT%(cn)d_LINUX_PAGE_OFFSET) #define CONFIG_CONT%(cn)d_PAGER_LMA (CONFIG_CONT%(cn)d_LINUX_PHYS_OFFSET) #define CONFIG_CONT%(cn)d_PAGER_VMA (CONFIG_CONT%(cn)d_LINUX_PAGE_OFFSET) - #define CONFIG_CONT%(cn)d_PAGER_SIZE CONFIG_CONT%(cn)d_LINUX_MAPSIZE + #define CONFIG_CONT%(cn)d_PAGER_MAPSIZE CONFIG_CONT%(cn)d_LINUX_MAPSIZE #else #define CONFIG_CONT%(cn)d_START_PC_ADDR (CONFIG_CONT%(cn)d_PAGER_VMA) #endif