Skip to content

Commit 46916e1

Browse files
author
Johnathan Van Why
committed
Fix variable name in the QEMU deployer: tab_path -> tbf_path, and clarify runner's TBF_HEADER_SIZE value.
1 parent a67900f commit 46916e1

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

runner/src/elf2tab.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ pub struct OutFiles {
8888
pub tbf_path: PathBuf,
8989
}
9090

91-
// The amount of space to reserve for the TBF header.
91+
// The amount of space to reserve for the TBF header. This must match the
92+
// TBF_HEADER_SIZE value in the layout file for the platform, which is currently
93+
// 0x48 for all platforms.
9294
const TBF_HEADER_SIZE: u32 = 0x48;
9395

9496
// Reads the stack size, and returns it as a String for use on elf2tab's command

runner/src/qemu.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ use std::process::{Child, Command, Stdio};
44

55
// Spawns a QEMU VM with a simulated Tock system and the process binary. Returns
66
// the handle for the spawned QEMU process.
7-
pub fn deploy(cli: &Cli, platform: String, tab_path: PathBuf) -> Child {
7+
pub fn deploy(cli: &Cli, platform: String, tbf_path: PathBuf) -> Child {
88
let platform_args = get_platform_args(platform);
99
let device = format!(
1010
"loader,file={},addr={}",
11-
tab_path
11+
tbf_path
1212
.into_os_string()
1313
.into_string()
1414
.expect("Non-UTF-8 path"),

0 commit comments

Comments
 (0)