ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-11 20:01:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cbe tools: log less by default

Browse Source 
Previously unconditional calls to Genode::log in cbe init and the cbe trust
anchor VFS plugin were made dependent on a verbosity flag that is set to
"false" by default.

Ref #4032
This commit is contained in:
Martin Stein
2021-04-26 17:16:14 +02:00
committed by Norman Feske
parent 8dfa586462
commit 3e375e4315
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
repos/gems/src/app/cbe_init/main.cc
View File

@ -27,6 +27,7 @@
#include <cbe/init/configuration.h> #include <cbe/init/configuration.h>
#include <cbe/vfs/trust_anchor_vfs.h> #include <cbe/vfs/trust_anchor_vfs.h>
enum { VERBOSE = 0 };
using namespace Genode; using namespace Genode;
@ -61,6 +62,7 @@ class Main
node.attribute_value("trust_anchor_dir", String_path()); node.attribute_value("trust_anchor_dir", String_path());
if (!path.valid()) { if (!path.valid()) {
error("missing mandatory 'trust_anchor_dir' config attribute"); error("missing mandatory 'trust_anchor_dir' config attribute");
struct Missing_config_attribute { }; struct Missing_config_attribute { };
throw Missing_config_attribute(); throw Missing_config_attribute();
@ -196,7 +198,9 @@ class Main
if (req.valid()) { if (req.valid()) {
_cbe_init.drop_completed_client_request(req); _cbe_init.drop_completed_client_request(req);
if (req.success()) { if (req.success()) {
if (VERBOSE) {
log("CBE initialization finished"); log("CBE initialization finished");
}
_env.parent().exit(0); _env.parent().exit(0);
} else { } else {
error("request was not successful");; error("request was not successful");;

4
repos/gems/src/app/cbe_init_trust_anchor/component.cc
View File

@ -25,7 +25,6 @@
/* CBE includes */ /* CBE includes */
#include <cbe/vfs/io_job.h> #include <cbe/vfs/io_job.h>
using namespace Genode; using namespace Genode;
class Main class Main
@ -215,9 +214,6 @@ class Main
if (result.complete) { if (result.complete) {
_init_file->drop_io_job(); _init_file->drop_io_job();
_init_file.destruct(); _init_file.destruct();
Genode::log("Initialization finished successfully");
_env.parent().exit(result.success ? 0 : 1); _env.parent().exit(result.success ? 0 : 1);
return; return;
} }

3
repos/gems/src/lib/vfs/cbe_trust_anchor/vfs.cc
View File

@ -29,6 +29,7 @@
enum { PRIVATE_KEY_SIZE = 32 }; enum { PRIVATE_KEY_SIZE = 32 };
enum { PASSPHRASE_HASH_SIZE = 32 }; enum { PASSPHRASE_HASH_SIZE = 32 };
enum { VERBOSE = 0 };
namespace Vfs_cbe_trust_anchor { namespace Vfs_cbe_trust_anchor {
@ -987,9 +988,11 @@ class Trust_anchor
} }
} }
else { else {
if (VERBOSE) {
Genode::log("No key file found, TA not initialized"); Genode::log("No key file found, TA not initialized");
} }
} }
}
bool initialized() const bool initialized() const
{ {