futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vm: If not the same local architecture, don't enable kvm.

Browse Source 
* gnu/system/vm.scm (common-qemu-options): Add target keyword.

Change-Id: Ic9bf18cf60ac5ce623289df31ea050a22c6e604e
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Zheng Junjie 2024-03-19 23:18:41 +08:00 committed by Ludovic Courtès
parent e6241de15a
commit 16c7130835
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/system/vm.scm
View File

@ -210,7 +210,9 @@ environment with the store shared with the host. MAPPINGS is a list of
virtual-file-systems))))) virtual-file-systems)))))
(define* (common-qemu-options image shared-fs (define* (common-qemu-options image shared-fs
#:key rw-image?) #:key
rw-image?
(target (%current-target-system)))
"Return the a string-value gexp with the common QEMU options to boot IMAGE, "Return the a string-value gexp with the common QEMU options to boot IMAGE,
with '-virtfs' options for the host file systems listed in SHARED-FS." with '-virtfs' options for the host file systems listed in SHARED-FS."
@ -221,7 +223,7 @@ with '-virtfs' options for the host file systems listed in SHARED-FS."
#~(;; Only enable kvm if we see /dev/kvm exists. #~(;; Only enable kvm if we see /dev/kvm exists.
;; This allows users without hardware virtualization to still use these ;; This allows users without hardware virtualization to still use these
;; commands. ;; commands.
#$@(if (file-exists? "/dev/kvm") #$@(if (and (not target) (file-exists? "/dev/kvm"))
'("-enable-kvm") '("-enable-kvm")
'()) '())
@ -302,7 +304,8 @@ useful when FULL-BOOT? is true."
#$@(common-qemu-options (if volatile? base-image rw-image) #$@(common-qemu-options (if volatile? base-image rw-image)
(map file-system-mapping-source (map file-system-mapping-source
(cons %store-mapping mappings)) (cons %store-mapping mappings))
#:rw-image? (not volatile?)) #:rw-image? (not volatile?)
#:target target)
"-m " (number->string #$memory-size) "-m " (number->string #$memory-size)
#$@options)) #$@options))