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

cloud-hypervisor: Use correct console on aarch64 #249

Merged
merged 1 commit into from
Jun 12, 2024
Merged

cloud-hypervisor: Use correct console on aarch64 #249

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion lib/runners/cloud-hypervisor.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
}:

let
inherit (pkgs) lib;
inherit (pkgs) lib system;
inherit (microvmConfig) vcpu mem balloonMem user interfaces volumes shares socket devices hugepageMem graphics storeDisk storeOnDisk kernel initrdPath;
inherit (microvmConfig.cloud-hypervisor) extraArgs;

Expand All @@ -13,6 +13,13 @@ let
aarch64-linux = "${kernel.out}/${pkgs.stdenv.hostPlatform.linux-kernel.target}";
}.${pkgs.system};

kernelConsole =
if system == "x86_64-linux"
then "earlyprintk=ttyS0 console=ttyS0"
else if system == "aarch64-linux"
then "console=ttyAMA0"
else "";

# balloon
useBallooning = balloonMem > 0;

Expand Down