diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-30 11:28:26 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-30 16:57:27 +0200 |
commit | 8e83158f124f6c8d5583a32102f281bde10769cd (patch) | |
tree | 9df50d0840aa9ebc0b6af8eba5d17a213b611ac4 /nixos/modules/virtualisation | |
parent | 1ce13804978ef361511014d8fc8e4d358de72dfa (diff) | |
download | nixlib-8e83158f124f6c8d5583a32102f281bde10769cd.tar nixlib-8e83158f124f6c8d5583a32102f281bde10769cd.tar.gz nixlib-8e83158f124f6c8d5583a32102f281bde10769cd.tar.bz2 nixlib-8e83158f124f6c8d5583a32102f281bde10769cd.tar.lz nixlib-8e83158f124f6c8d5583a32102f281bde10769cd.tar.xz nixlib-8e83158f124f6c8d5583a32102f281bde10769cd.tar.zst nixlib-8e83158f124f6c8d5583a32102f281bde10769cd.zip |
nixos/qemu: Deduplicate QEMU serialDevice into qemu-flags.nix
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 26f7945a4eda..c52f637604ae 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -10,6 +10,7 @@ { config, lib, pkgs, ... }: with lib; +with import ../../lib/qemu-flags.nix { inherit pkgs; }; let @@ -21,11 +22,6 @@ let "aarch64-linux" = "${qemu}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; }.${pkgs.stdenv.system}; - # FIXME: figure out a common place for this instead of copy pasting - serialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0" - else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0" - else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'"; - vmName = if config.networking.hostName == "" then "noname" @@ -34,7 +30,7 @@ let cfg = config.virtualisation; qemuGraphics = if cfg.graphics then "" else "-nographic"; - kernelConsole = if cfg.graphics then "" else "console=${serialDevice}"; + kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}"; ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ]; # Shell script to start the VM. |