From 04075b108ca3c219bbb6c625b9938b1d1fbc8232 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Sun, 27 Sep 2020 12:43:37 +0200
Subject: [PATCH] test: use QEMU from stable nixpkgs

---
 test/lib/make-test-vm.nix | 10 ----------
 test/run-tests.sh         |  9 +++++++--
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/test/lib/make-test-vm.nix b/test/lib/make-test-vm.nix
index 860751a..26c85ad 100644
--- a/test/lib/make-test-vm.nix
+++ b/test/lib/make-test-vm.nix
@@ -3,11 +3,6 @@ testArgs:
 let
   pkgs = import <nixpkgs> { config = {}; overlays = []; };
 
-  pkgs19_09 = import (pkgs.fetchzip {
-    url = "https://github.com/NixOS/nixpkgs-channels/archive/a7ceb2536ab11973c59750c4c48994e3064a75fa.tar.gz";
-    sha256 = "0hka65f31njqpq7i07l22z5rs7lkdfcl4pbqlmlsvnysb74ynyg1";
-  }) { config = {}; overlays = []; };
-
   test = (import "${pkgs.path}/nixos/tests/make-test-python.nix") testArgs;
 
   fixedTest = { system ? builtins.currentSystem, ... }@args:
@@ -23,11 +18,6 @@ let
              exec ${pkgs.python3Packages.black}/bin/black $extraArgs "$@"
            '';
          };
-
-         # QEMU 4.20 from unstable fails on Travis build nodes with message
-         # "error: failed to set MSR 0x48b to 0x159ff00000000"
-         # Use version 4.0.1 instead.
-         inherit (pkgs19_09) qemu_test;
        };
     in
       test (args // { pkgs = pkgsFixed; });
diff --git a/test/run-tests.sh b/test/run-tests.sh
index 8e9b5e6..dd1bed6 100755
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@@ -149,14 +149,19 @@ exprForCI() {
     ((memAvailableMiB < memoryMiB)) && memoryMiB=$memAvailableMiB
     >&2 echo "VM stats: CPUs: $numCPUs, memory: $memoryMiB MiB"
     >&2 echo "Host memory total: $((memTotalKiB / 1024)) MiB, available: $memAvailableMiB MiB"
-    vmTestNixExpr
+
+    # VMX is usually not available on CI nodes due to recursive virtualisation.
+    # Explicitly disable VMX, otherwise QEMU 4.20 fails with message
+    # "error: failed to set MSR 0x48b to 0x159ff00000000"
+    vmTestNixExpr "-cpu host,-vmx"
 }
 
 vmTestNixExpr() {
+  extraQEMUOpts="$1"
   cat <<EOF
     ((import "$testDir/tests.nix" { scenario = "$scenario"; }).vm {}).overrideAttrs (old: rec {
       buildCommand = ''
-        export QEMU_OPTS="-smp $numCPUs -m $memoryMiB"
+        export QEMU_OPTS="-smp $numCPUs -m $memoryMiB $extraQEMUOpts"
         echo "VM stats: CPUs: $numCPUs, memory: $memoryMiB MiB"
       '' + old.buildCommand;
     })