qemu: add option microvm.qemu.serialConsole

For some applications like UART passthrough we want to disable the default qemu virtual serial (-serial chardev:stdio). With this flag in false we remove this virtual device and the ttyAMA0/S0 kernel console. Signed-off-by: Juan Pablo Ruiz <[email protected]>
astro · Jan 24, 2024 · ce0d2e3 · ce0d2e3
1 parent f07dd64
commit ce0d2e3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/lib/runners/qemu.nix b/lib/runners/qemu.nix
@@ -39,7 +39,7 @@ let
     pkgs.qemu_kvm else pkgs.buildPackages.qemu_full);
 
   inherit (microvmConfig) hostName cpu vcpu mem balloonMem user interfaces shares socket forwardPorts devices vsock graphics storeOnDisk kernel initrdPath storeDisk;
-  inherit (microvmConfig.qemu) extraArgs;
+  inherit (microvmConfig.qemu) extraArgs serialConsole;
 
   inherit (import ../. { nixpkgs-lib = pkgs.lib; }) withDriveLetters;
 
@@ -121,6 +121,17 @@ let
   writeQmp = data: ''
     echo '${builtins.toJSON data}'
   '';
+
+  kernelConsole =
+    if microvmConfig.qemu.serialConsole == false
+    then ""
+    else if system == "x86_64-linux"
+    then "earlyprintk=ttyS0 console=ttyS0"
+    else if system == "aarch64-linux"
+    then "console=ttyAMA0"
+    else "";
+
+
 in {
   inherit tapMultiQueue;
 
@@ -139,20 +150,22 @@ in {
       "-initrd" initrdPath
 
       "-chardev" "stdio,id=stdio,signal=off"
-      "-serial" "chardev:stdio"
       "-device" "virtio-rng-${devType}"
     ] ++
+    lib.optionals serialConsole [
+      "-serial" "chardev:stdio"
+    ] ++
     lib.optionals (microvmConfig.cpu == null) [
       "-enable-kvm"
     ] ++
     cpuArgs ++
     lib.optionals (system == "x86_64-linux") [
       "-device" "i8042"
 
-      "-append" "earlyprintk=ttyS0 console=ttyS0 reboot=t panic=-1 ${toString microvmConfig.kernelParams}"
+      "-append" "${kernelConsole} reboot=t panic=-1 ${toString microvmConfig.kernelParams}"
     ] ++
     lib.optionals (system == "aarch64-linux") [
-      "-append" "console=ttyAMA0 reboot=t panic=-1 ${toString microvmConfig.kernelParams}"
+      "-append" "${kernelConsole} reboot=t panic=-1 ${toString microvmConfig.kernelParams}"
     ] ++
     lib.optionals storeOnDisk [
       "-drive" "id=store,format=raw,read-only=on,file=${storeDisk},if=none,aio=io_uring"

diff --git a/nixos-modules/microvm/options.nix b/nixos-modules/microvm/options.nix
@@ -394,6 +394,14 @@ in
       description = "Extra arguments to pass to qemu.";
     };
 
+    qemu.serialConsole = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether to enable the virtual serial console on qemu.
+      '';
+    };
+
     crosvm.extraArgs = mkOption {
       type = with types; listOf str;
       default = [];