Replace 'ram_block' with 'vfs_block'

Issue #3781.
This commit is contained in:
Josef Söntgen
2020-06-18 16:27:10 +02:00
committed by Norman Feske
parent e5b00d89fb
commit ec711b008e
22 changed files with 286 additions and 102 deletions

View File

@@ -6,9 +6,10 @@ set build_components {
app/rom_logger
app/rom_to_file
lib/vfs/rump
lib/vfs/import
server/dynamic_rom
server/fs_rom
server/ram_block
server/vfs_block
server/vfs
}
@@ -45,10 +46,19 @@ append config {
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="ram_block">
<resource name="RAM" quantum="16M" />
<start name="vfs_block">
<resource name="RAM" quantum="11M"/>
<provides><service name="Block"/></provides>
<config file="ext2.img" block_size="512"/>
<config>
<vfs>
<ram/>
<import>
<rom name="ext2.img"/>
</import>
</vfs>
<default-policy file="ext2.img" block_size="512"
writeable="yes"/>
</config>
</start>
<start name="vfs" caps="256">
<resource name="RAM" quantum="10M"/>
@@ -123,7 +133,7 @@ set boot_modules {
dynamic_rom
ext2.img
fs_rom
ram_block
vfs_block
rom_logger
rom_to_file
rump_fs.lib.so
@@ -132,6 +142,7 @@ set boot_modules {
vfs
vfs.lib.so
vfs_rump.lib.so
vfs_import.lib.so
}
build_boot_image $boot_modules

View File

@@ -13,9 +13,10 @@ set dd [installed_command dd]
#
set build_components {
core init timer
server/ram_block
server/vfs_block
server/vfs
lib/vfs/rump
lib/vfs/import
test/libc_vfs
}
@@ -52,10 +53,19 @@ append config {
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="ram_block" caps="120">
<start name="vfs_block" caps="110">
<resource name="RAM" quantum="20M"/>
<provides><service name="Block"/></provides>
<config file="ext2.raw" block_size="512"/>
<config>
<vfs>
<ram/>
<import>
<rom name="ext2.raw"/>
</import>
</vfs>
<default-policy root="/" file="ext2.raw" block_size="512"
writeable="yes"/>
</config>
</start>
<start name="vfs" caps="200">
<resource name="RAM" quantum="16M" />
@@ -85,15 +95,15 @@ install_config $config
# generic modules
set boot_modules {
core ld.lib.so init timer test-libc_vfs ram_block
core ld.lib.so init timer test-libc_vfs vfs_block
rump.lib.so rump_fs.lib.so vfs vfs_rump.lib.so
ext2.raw libc.lib.so vfs.lib.so
ext2.raw libc.lib.so vfs.lib.so vfs_import.lib.so
}
build_boot_image $boot_modules
append qemu_args " -nographic"
run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60
run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 80
exec rm -f bin/ext2.raw

View File

@@ -13,9 +13,10 @@ set dd [installed_command dd]
#
set build_components {
core init timer
server/ram_block
server/vfs_block
server/vfs
lib/vfs/rump
lib/vfs/import
test/libc_vfs
}
@@ -52,10 +53,19 @@ append config {
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="ram_block">
<resource name="RAM" quantum="20M"/>
<start name="vfs_block">
<resource name="RAM" quantum="17M"/>
<provides><service name="Block"/></provides>
<config file="fs.raw" block_size="512"/>
<config>
<vfs>
<ram/>
<import>
<rom name="fs.raw"/>
</import>
</vfs>
<default-policy root="/" file="fs.raw" block_size="512"
writeable="yes"/>
</config>
</start>
<start name="vfs" caps="200">
<resource name="RAM" quantum="10M" />
@@ -87,9 +97,9 @@ install_config $config
# generic modules
set boot_modules {
core ld.lib.so init timer test-libc_vfs ram_block
core ld.lib.so init timer test-libc_vfs vfs_block
rump.lib.so rump_fs.lib.so vfs vfs_rump.lib.so
fs.raw libc.lib.so vfs.lib.so
fs.raw libc.lib.so vfs.lib.so vfs_import.lib.so
}
build_boot_image $boot_modules

View File

@@ -10,7 +10,15 @@
set mke2fs [installed_command mke2fs]
set dd [installed_command dd]
build "core init timer test/vfs_stress server/ram_block lib/vfs/rump"
set build_components {
core init timer
test/vfs_stress
server/vfs_block
lib/vfs/rump
lib/vfs/import
}
build $build_components
#
# Build EXT2-file-system image
@@ -39,10 +47,19 @@ install_config {
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="ram_block">
<resource name="RAM" quantum="24M"/>
<start name="vfs_block">
<resource name="RAM" quantum="20M"/>
<provides><service name="Block"/></provides>
<config file="ext2.raw" block_size="512"/>
<config>
<vfs>
<ram/>
<import>
<rom name="ext2.raw"/>
</import>
</vfs>
<default-policy root="/" file="ext2.raw" block_size="512"
writeable="yes"/>
</config>
</start>
<start name="vfs_stress" caps="200">
<resource name="RAM" quantum="32M"/>
@@ -56,8 +73,8 @@ install_config {
set boot_modules {
core init ld.lib.so timer vfs_stress
rump.lib.so rump_fs.lib.so
vfs.lib.so vfs_rump.lib.so
ram_block ext2.raw
vfs.lib.so vfs_rump.lib.so vfs_import.lib.so
vfs_block ext2.raw
}
build_boot_image $boot_modules

View File

@@ -10,7 +10,17 @@
set mke2fs [installed_command mke2fs]
set dd [installed_command dd]
build "core init timer test/vfs_stress server/ram_block server/vfs lib/vfs/rump"
set build_components {
core init timer
test/vfs_stress
server/vfs
server/vfs_block
lib/vfs/rump
lib/vfs/import
}
build $build_components
#
# Build EXT2-file-system image
@@ -45,10 +55,19 @@ install_config {
<vfs> <fs/> </vfs>
</config>
</start>
<start name="ram_block">
<resource name="RAM" quantum="24M"/>
<start name="vfs_block">
<resource name="RAM" quantum="34M"/>
<provides><service name="Block"/></provides>
<config file="ext2.raw" block_size="512"/>
<config>
<vfs>
<ram/>
<import>
<rom name="ext2.raw"/>
</import>
</vfs>
<default-policy root="/" file="ext2.raw" block_size="512"
writeable="yes"/>
</config>
</start>
<start name="vfs" caps="200">
<resource name="RAM" quantum="24M"/>
@@ -64,7 +83,7 @@ install_config {
set boot_modules {
core init ld.lib.so timer vfs_stress
rump.lib.so rump_fs.lib.so vfs vfs_rump.lib.so
ram_block ext2.raw vfs.lib.so
vfs_block ext2.raw vfs.lib.so vfs_import.lib.so
}
build_boot_image $boot_modules