Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

runtime-rs on arm64: Fixes unable to Boot Container Image using Cloud… #8422

Merged
merged 1 commit into from
Nov 22, 2023
Merged

runtime-rs on arm64: Fixes unable to Boot Container Image using Cloud… #8422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/runtime-rs/crates/hypervisor/src/ch/inner_hypervisor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,19 @@ impl CloudHypervisorInner {
// Start by adding the default set of kernel parameters.
let mut params = KernelParams::new(enable_debug);

#[cfg(target_arch = "x86_64")]
let console_param_debug = KernelParams::from_string("console=ttyS0,115200n8");

#[cfg(target_arch = "aarch64")]
let console_param_debug = KernelParams::from_string("console=ttyAMA0,115200n8");

let mut rootfs_param = KernelParams::new_rootfs_kernel_params(rootfs_driver, rootfs_type)?;

let mut console_params = if enable_debug {
if confidential_guest {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not related to this PR, but would you be able to look at raising a PR to allow confidential_guest=true on aarch64 with runtime-rs and CH?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no confidential computing support in any of VMM on aarch64 for now. So, I think it's not the time to enable confidential guest.

KernelParams::from_string("console=hvc0")
} else {
KernelParams::from_string("console=ttyS0,115200n8")
console_param_debug
}
} else {
KernelParams::from_string("quiet")
Expand Down