commit e56da6a4642c843d7ba88f513840da7d473eecec · pyrox.dev/nixpkgs

+14 -8

nixos/modules/testing/test-instrumentation.nix

···

       5
       5
        
       

     

       6
       6
        
       with lib;

     

       7
       7
        
       

     

       8
       8
       -
       let kernel = config.boot.kernelPackages.kernel; in

     

       8
       8
       +
       let

     

       9
       9
       +
         kernel = config.boot.kernelPackages.kernel;

     

       10
       10
       +
         # FIXME: figure out a common place for this instead of copy pasting

     

       11
       11
       +
         serialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0"

     

       12
       12
       +
               else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0"

     

       13
       13
       +
               else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'";

     

       14
       14
       +
       in

     

       9
       15
        
       

     

       10
       16
        
       {

     

       11
       17
        
       

     
···

       22
       28
        
       

     

       23
       29
        
           systemd.services.backdoor =

     

       24
       30
        
             { wantedBy = [ "multi-user.target" ];

     

       25
       25
       -
               requires = [ "dev-hvc0.device" "dev-ttyS0.device" ];

     

       26
       26
       -
               after = [ "dev-hvc0.device" "dev-ttyS0.device" ];

     

       31
       31
       +
               requires = [ "dev-hvc0.device" "dev-${serialDevice}.device" ];

     

       32
       32
       +
               after = [ "dev-hvc0.device" "dev-${serialDevice}.device" ];

     

       27
       33
        
               script =

     

       28
       34
        
                 ''

     

       29
       35
        
                   export USER=root

     
···

       40
       46
        
       

     

       41
       47
        
                   cd /tmp

     

       42
       48
        
                   exec < /dev/hvc0 > /dev/hvc0

     

       43
       43
       -
                   while ! exec 2> /dev/ttyS0; do sleep 0.1; done

     

       49
       49
       +
                   while ! exec 2> /dev/${serialDevice}; do sleep 0.1; done

     

       44
       50
        
                   echo "connecting to host..." >&2

     

       45
       51
        
                   stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion

     

       46
       52
        
                   echo

     
···

       49
       55
        
               serviceConfig.KillSignal = "SIGHUP";

     

       50
       56
        
             };

     

       51
       57
        
       

     

       52
       52
       -
           # Prevent agetty from being instantiated on ttyS0, since it

     

       53
       53
       -
           # interferes with the backdoor (writes to ttyS0 will randomly fail

     

       58
       58
       +
           # Prevent agetty from being instantiated on ${serialDevice}, since it

     

       59
       59
       +
           # interferes with the backdoor (writes to ${serialDevice} will randomly fail

     

       54
       60
        
           # with EIO).  Likewise for hvc0.

     

       55
       55
       -
           systemd.services."serial-getty@ttyS0".enable = false;

     

       61
       61
       +
           systemd.services."serial-getty@${serialDevice}".enable = false;

     

       56
       62
        
           systemd.services."serial-getty@hvc0".enable = false;

     

       57
       63
        
       

     

       58
       64
        
           boot.initrd.preDeviceCommands =

     
···

       88
       94
        
           # Panic if an error occurs in stage 1 (rather than waiting for

     

       89
       95
        
           # user intervention).

     

       90
       96
        
           boot.kernelParams =

     

       91
       91
       -
             [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];

     

       97
       97
       +
             [ "console=${serialDevice}" "panic=1" "boot.panic_on_fail" ];

     

       92
       98
        
       

     

       93
       99
        
           # `xwininfo' is used by the test driver to query open windows.

     

       94
       100
        
           environment.systemPackages = [ pkgs.xorg.xwininfo ];

+6 -1

nixos/modules/virtualisation/qemu-vm.nix

···

       21
       21
        
           "aarch64-linux" = "${qemu}/bin/qemu-system-aarch64 -enable-kvm -machine virt -cpu host";

     

       22
       22
        
         }.${pkgs.stdenv.system};

     

       23
       23
        
       

     

       24
       24
       +
         # FIXME: figure out a common place for this instead of copy pasting

     

       25
       25
       +
         serialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0"

     

       26
       26
       +
               else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0"

     

       27
       27
       +
               else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'";

     

       28
       28
       +
       

     

       24
       29
        
         vmName =

     

       25
       30
        
           if config.networking.hostName == ""

     

       26
       31
        
           then "noname"

     
···

       29
       34
        
         cfg = config.virtualisation;

     

       30
       35
        
       

     

       31
       36
        
         qemuGraphics = if cfg.graphics then "" else "-nographic";

     

       32
       32
       -
         kernelConsole = if cfg.graphics then "" else "console=ttyS0";

     

       37
       37
       +
         kernelConsole = if cfg.graphics then "" else "console=${serialDevice}";

     

       33
       38
        
         ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ];

     

       34
       39
        
       

     

       35
       40
        
         # Shell script to start the VM.