Skip to content

Commit

Permalink
boot_cheribsd: Support --expected-kernel-abi=purecap-benchmark
Browse files Browse the repository at this point in the history
  • Loading branch information
jrtc27 committed May 29, 2024
1 parent 4415e59 commit 3b2f362
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pycheribuild/boot_cheribsd/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
BOOT_LOADER_PROMPT = "OK "
CHERI_HYBRID_KERNEL_MSG = "CHERI hybrid kernel."
CHERI_PURECAP_KERNEL_MSG = "CHERI pure-capability kernel."
CHERI_PURECAP_BENCHMARK_KERNEL_MSG = "CHERI pure-capability benchmark ABI kernel."

STARTING_INIT = "start_init: trying /sbin/init"
TRYING_TO_MOUNT_ROOT = re.compile(r"Trying to mount root from .+\.\.\.")
Expand Down Expand Up @@ -975,6 +976,7 @@ def boot_cheribsd(
expected_kernel_abi_arg_to_regex = {
"hybrid": CHERI_HYBRID_KERNEL_MSG,
"purecap": CHERI_PURECAP_KERNEL_MSG,
"purecap-benchmark": CHERI_PURECAP_BENCHMARK_KERNEL_MSG,
"any": None,
}
boot_and_login(
Expand Down Expand Up @@ -1457,7 +1459,7 @@ def get_argument_parser() -> argparse.ArgumentParser:
)
parser.add_argument(
"--expected-kernel-abi",
choices=["any", "hybrid", "purecap"],
choices=["any", "hybrid", "purecap", "purecap-benchmark"],
default="any",
help="The kernel kind that is expected ('any' to skip checks)",
)
Expand Down

0 comments on commit 3b2f362

Please sign in to comment.