diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2023-12-14 22:26:45 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-12-14 23:12:24 +0100 |
| commit | 1de1b975be97340ece33356430add3837f5eaae1 (patch) | |
| tree | 7b1bf498e1a86505f5fc72da02f1840cdad9b123 /gnu | |
| parent | 59d65f66c505884cc46d7277889d34d3672a8378 (diff) | |
| download | guix-1de1b975be97340ece33356430add3837f5eaae1.tar.gz guix-1de1b975be97340ece33356430add3837f5eaae1.zip | |
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
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/tests/virtualization.scm | 6 |
1 files 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") |