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

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 16c713083516e60b5ae30b3a8b49d5bf8d4cadc3
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Tue Mar 19 23:18:41 2024 +0800

    vm: If not the same local architecture, don't enable kvm.
    
    * gnu/system/vm.scm (common-qemu-options): Add target keyword.
    
    Change-Id: Ic9bf18cf60ac5ce623289df31ea050a22c6e604e
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/system/vm.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 64cc321ebf..7d9d07ebb7 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -210,7 +210,9 @@ environment with the store shared with the host.  MAPPINGS 
is a list of
                        virtual-file-systems)))))
 
 (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,
 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.
      ;; This allows users without hardware virtualization to still use these
      ;; commands.
-     #$@(if (file-exists? "/dev/kvm")
+     #$@(if (and (not target) (file-exists? "/dev/kvm"))
             '("-enable-kvm")
             '())
 
@@ -302,7 +304,8 @@ useful when FULL-BOOT?  is true."
               #$@(common-qemu-options (if volatile? base-image rw-image)
                                       (map file-system-mapping-source
                                            (cons %store-mapping mappings))
-                                      #:rw-image? (not volatile?))
+                                      #:rw-image? (not volatile?)
+                                      #:target target)
               "-m " (number->string #$memory-size)
               #$@options))