guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/07: tests: childhurd: Prefer “-cpu max” over “-cpu host”.


From: guix-commits
Subject: 04/07: tests: childhurd: Prefer “-cpu max” over “-cpu host”.
Date: Thu, 14 Dec 2023 17:19:00 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 1de1b975be97340ece33356430add3837f5eaae1
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Dec 14 22:26:45 2023 +0100

    tests: childhurd: Prefer “-cpu max” over “-cpu host”.
    
    “-cpu host” can sometimes, for unclear reasons, lead to this error from
    QEMU 8.1.1:
    
      qemu-system-x86_64: CPU model 'host' requires KVM or HVF
    
    This commit fixes it.
    
    Inspired by
    
<https://github.com/matthewbauer/nixpkgs/commit/47b56e7c19c2e3af685ee408f02f232efb3d12b1>.
    
    * gnu/tests/virtualization.scm (run-childhurd-test)[test]: Prefer
    “-cpu max” over “-cpu host”.
    
    Change-Id: I11a8a68bb0532fe1f3fd2c34b4a7a5fdb7bccb57
---
 gnu/tests/virtualization.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm
index ef4b130334..f3655f1d8a 100644
--- a/gnu/tests/virtualization.scm
+++ b/gnu/tests/virtualization.scm
@@ -298,10 +298,10 @@
                        (ice-9 match))
 
           (define marionette
-            ;; Emulate the host CPU so that KVM is available inside as well
-            ;; ("nested KVM"), provided
+            ;; Emulate as much as the host CPU supports so that, possibly, KVM
+            ;; is available inside as well ("nested KVM"), provided
             ;; /sys/module/kvm_intel/parameters/nested (or similar) allows it.
-            (make-marionette (list #$vm "-cpu" "host")))
+            (make-marionette (list #$vm "-cpu" "max")))
 
           (test-runner-current (system-test-runner #$output))
           (test-begin "childhurd")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]