Attention is currently required from: Furquan Shaikh, Ricardo Quesada, Edward O'Callaghan.

Jack Rosenthal would like Furquan Shaikh, Ricardo Quesada and Edward O'Callaghan to review this change.

View Change

flashrom_tester: Use elogtool to list firmware eventlog

Mosys is dropping the eventlog command, in favor of the elogtool
command provided in coreboot. The output is compatible with what
mosys used to output.

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I8c4be82fed28b6a19746e6b93fafce23bd8ede5d
---
M util/flashrom_tester/src/cros_sysinfo.rs
M util/flashrom_tester/src/tests.rs
2 files changed, 6 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/27/58527/1
diff --git a/util/flashrom_tester/src/cros_sysinfo.rs b/util/flashrom_tester/src/cros_sysinfo.rs
index ddb0802..4d1b347 100644
--- a/util/flashrom_tester/src/cros_sysinfo.rs
+++ b/util/flashrom_tester/src/cros_sysinfo.rs
@@ -61,13 +61,13 @@
}

pub fn eventlog_list() -> Result<String, std::io::Error> {
- mosys_dispatch(&["eventlog", "list"])
+ elogtool_dispatch(&["list"])
}

-fn mosys_dispatch<S: AsRef<OsStr> + Debug>(args: &[S]) -> IoResult<String> {
- info!("mosys_dispatch() running: /usr/sbin/mosys {:?}", args);
+fn elogtool_dispatch<S: AsRef<OsStr> + Debug>(args: &[S]) -> IoResult<String> {
+ info!("elogtool_dispatch() running: /usr/bin/elogtool {:?}", args);

- let output = Command::new("/usr/sbin/mosys")
+ let output = Command::new("/usr/bin/elogtool")
.args(args)
.stdin(Stdio::null())
.output()?;
diff --git a/util/flashrom_tester/src/tests.rs b/util/flashrom_tester/src/tests.rs
index 9ef98e5..c9ad603 100644
--- a/util/flashrom_tester/src/tests.rs
+++ b/util/flashrom_tester/src/tests.rs
@@ -234,8 +234,8 @@

fn elog_sanity_test(env: &mut TestEnv) -> TestResult {
// Check that the elog contains *something*, as an indication that Coreboot
- // is actually able to write to the Flash. Because this invokes mosys on the
- // host, it doesn't make sense to run for other chips.
+ // is actually able to write to the Flash. Because this invokes elogtool on
+ // the host, it doesn't make sense to run for other chips.
if env.chip_type() != FlashChip::HOST {
info!("Skipping ELOG sanity check for non-host chip");
return Ok(());

To view, visit change 58527. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I8c4be82fed28b6a19746e6b93fafce23bd8ede5d
Gerrit-Change-Number: 58527
Gerrit-PatchSet: 1
Gerrit-Owner: Jack Rosenthal <jrosenth@chromium.org>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan@google.com>
Gerrit-Reviewer: Ricardo Quesada <ricardoq@google.com>
Gerrit-Attention: Furquan Shaikh <furquan@google.com>
Gerrit-Attention: Ricardo Quesada <ricardoq@google.com>
Gerrit-Attention: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-MessageType: newchange