From d5e3f738847a32f0bbbb9e21fb878d900be2a5c7 Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Mon, 22 Apr 2024 11:45:05 +0200 Subject: [PATCH] file_vault: do not consider ui_config version The version in ui_report and ui_config were merely used for making test output more readable. However, there are other ways to achieve this goal. Ref #5190 --- .../gems/recipes/pkg/test-file_vault/runtime | 47 +++++-------------- .../pkg/test-file_vault_no_entropy/runtime | 47 +++++-------------- repos/gems/run/file_vault.run | 41 +++------------- repos/gems/run/file_vault_client.run | 21 +++------ .../app/file_vault/include/file_vault/types.h | 7 --- 5 files changed, 35 insertions(+), 128 deletions(-) diff --git a/repos/gems/recipes/pkg/test-file_vault/runtime b/repos/gems/recipes/pkg/test-file_vault/runtime index 5f95dfb303e..524eb42c7b6 100644 --- a/repos/gems/recipes/pkg/test-file_vault/runtime +++ b/repos/gems/recipes/pkg/test-file_vault/runtime @@ -6,11 +6,11 @@ - <ui_report version="step_*" state="uninitialized"* - <ui_report version="step_*" state="initializing"* - <ui_report version="step_*" state="unlocked"* - <ui_report version="step_*" state="locked"* - <ui_report version="step_*" state="unlocked"* + <ui_report state="uninitialized"* + <ui_report state="initializing"* + <ui_report state="unlocked"* + <ui_report state="locked"* + <ui_report state="unlocked"* @@ -40,43 +40,18 @@ - - - - - + - - - - - + - - - - - + - - - - - + - - - - - + - - - - - + - diff --git a/repos/gems/recipes/pkg/test-file_vault_no_entropy/runtime b/repos/gems/recipes/pkg/test-file_vault_no_entropy/runtime index ababdda86b2..0d4fe756e59 100644 --- a/repos/gems/recipes/pkg/test-file_vault_no_entropy/runtime +++ b/repos/gems/recipes/pkg/test-file_vault_no_entropy/runtime @@ -6,11 +6,11 @@ - <ui_report version="step_*" state="uninitialized"* - <ui_report version="step_*" state="initializing"* - <ui_report version="step_*" state="unlocked"* - <ui_report version="step_*" state="locked"* - <ui_report version="step_*" state="unlocked"* + <ui_report state="uninitialized"* + <ui_report state="initializing"* + <ui_report state="unlocked"* + <ui_report state="locked"* + <ui_report state="unlocked"* @@ -40,43 +40,18 @@ - - - - - + - - - - - + - - - - - + - - - - - + - - - - - + - - - - - + - diff --git a/repos/gems/run/file_vault.run b/repos/gems/run/file_vault.run index acf94758cc2..7fafcc0d625 100644 --- a/repos/gems/run/file_vault.run +++ b/repos/gems/run/file_vault.run @@ -72,47 +72,20 @@ append config { - + - - - - - + - - - - - + - - - - - + - - - - - + - - - - - + - - - - - + - diff --git a/repos/gems/run/file_vault_client.run b/repos/gems/run/file_vault_client.run index dd771fd192c..118cd266695 100644 --- a/repos/gems/run/file_vault_client.run +++ b/repos/gems/run/file_vault_client.run @@ -110,31 +110,22 @@ append config { - + - - - - - + } if {[container_initialized]} { append config " - " + " } else { append config " - " + " } append config { - - - - - + - @@ -437,7 +428,7 @@ lappend_if [have_board linux] boot_modules [file tail [lx_fs_dir]] build_boot_image $boot_modules append qemu_args " -display none " -run_genode_until " dynamic_init -> log_terminal\].*} diff --git a/repos/gems/src/app/file_vault/include/file_vault/types.h b/repos/gems/src/app/file_vault/include/file_vault/types.h index 8d7a859eeda..ada4a55864c 100644 --- a/repos/gems/src/app/file_vault/include/file_vault/types.h +++ b/repos/gems/src/app/file_vault/include/file_vault/types.h @@ -44,8 +44,6 @@ namespace File_vault { fn(); }); } - using Version_string = String<80>; - inline size_t min_journal_buf(Number_of_bytes capacity) { size_t result { (size_t)capacity >> 8 }; @@ -122,7 +120,6 @@ namespace File_vault { }; State state { INVALID }; - Version_string version { }; Number_of_bytes image_size { }; Number_of_bytes capacity { }; Number_of_clients num_clients { }; @@ -134,7 +131,6 @@ namespace File_vault { Ui_report(Xml_node const &node) : state(string_to_state(node.attribute_value("state", State_string()))), - version(node.attribute_value("version", Version_string())), image_size(node.attribute_value("image_size", Number_of_bytes())), capacity(node.attribute_value("capacity", Number_of_bytes())), num_clients(node.attribute_value("num_clients", 0ULL)) @@ -146,7 +142,6 @@ namespace File_vault { void generate(Xml_generator &xml) { xml.attribute("state", state_to_string(state)); - xml.attribute("version", version); xml.attribute("image_size", image_size); xml.attribute("capacity", capacity); xml.attribute("num_clients", num_clients.value); @@ -212,7 +207,6 @@ namespace File_vault { void generate(Xml_generator &xml) { xml.attribute("id", id.value); } }; - Version_string version { }; Passphrase passphrase { }; Number_of_bytes client_fs_size { }; Number_of_bytes journaling_buf_size { }; @@ -221,7 +215,6 @@ namespace File_vault { Ui_config(Xml_node const &node) : - version(node.attribute_value("version", Version_string())), passphrase(node.attribute_value("passphrase", Passphrase())), client_fs_size(node.attribute_value("client_fs_size", Number_of_bytes())), journaling_buf_size(node.attribute_value("journaling_buf_size", Number_of_bytes()))