diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-11-28 00:38:25 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-11-28 00:38:25 +0100 |
commit | 0897ad7fac04fc9d814e83eed46e88c7bf9740bc (patch) | |
tree | 9bccfdb52de4c468778ceaabe337c0539c302a30 /gnu/build/vm.scm | |
parent | 6d460e80d1b06fc094374e7ba5c2503f2a897f11 (diff) | |
parent | 9943d238e9f07dccae973b641eb7738637ce95fb (diff) | |
download | guix-patches-0897ad7fac04fc9d814e83eed46e88c7bf9740bc.tar guix-patches-0897ad7fac04fc9d814e83eed46e88c7bf9740bc.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/build/vm.scm')
-rw-r--r-- | gnu/build/vm.scm | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index a5d9fefa62..6f920aec9e 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -82,6 +82,7 @@ make-disk-image? single-file-output? target-arm32? + target-aarch64? (disk-image-size (* 100 (expt 2 20))) (disk-image-format "qcow2") (references-graphs '())) @@ -97,16 +98,28 @@ access it via /dev/hda. REFERENCES-GRAPHS can specify a list of reference-graph files as produced by the #:references-graphs parameter of 'derivation'." + (define target-arm? (or target-arm32? target-aarch64?)) + (define arch-specific-flags `(;; On ARM, a machine has to be specified. Use "virt" machine to avoid ;; hardware limits imposed by other machines. - ,@(if target-arm32? '("-M" "virt") '()) + ,@(if target-arm? + '("-M" "virt") + '()) + + ;; On ARM32, if the kernel is built without LPAE support, ECAM conflicts + ;; with VIRT_PCIE_MMIO causing PCI devices not to show up. Disable + ;; explicitely highmem to fix it. + ;; See: https://bugs.launchpad.net/qemu/+bug/1790975. + ,@(if target-arm32? + '("-machine" "highmem=off") + '()) ;; Only enable kvm if we see /dev/kvm exists. This allows users without ;; hardware virtualization to still use these commands. KVM support is - ;; still buggy on some ARM32 boards. Do not use it even if available. + ;; still buggy on some ARM boards. Do not use it even if available. ,@(if (and (file-exists? "/dev/kvm") - (not target-arm32?)) + (not target-arm?)) '("-enable-kvm") '()) @@ -117,11 +130,11 @@ the #:references-graphs parameter of 'derivation'." ;; The serial port name differs between emulated ;; architectures/machines. " console=" - (if target-arm32? "ttyAMA0" "ttyS0")) + (if target-arm? "ttyAMA0" "ttyS0")) ;; NIC is not supported on ARM "virt" machine, so use a user mode ;; network stack instead. - ,@(if target-arm32? + ,@(if target-arm? '("-device" "virtio-net-pci,netdev=mynet" "-netdev" "user,id=mynet") '("-net" "nic,model=virtio")))) @@ -145,7 +158,9 @@ the #:references-graphs parameter of 'derivation'." (_ #f)) (apply invoke qemu "-nographic" "-no-reboot" - "-smp" (number->string (parallel-job-count)) + ;; CPU "max" behaves as "host" when KVM is enabled, and like a system + ;; CPU with the maximum possible feature set otherwise. + "-cpu" "max" "-m" (number->string memory-size) "-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng" "-device" "virtio-rng-pci,rng=guixsd-vm-rng" |