01/13: vm: Always use a native emulator in ‘guix system vm’.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit d33965908dc8e21e9c9834ce1061cdcc664295ab
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Apr 16 19:02:17 2024 +0200

    vm: Always use a native emulator in ‘guix system vm’.
    
    Suggested by Zheng Junjie <zhengjunjie@iscas.ac.cn>.
    
    * gnu/system/vm.scm (system-qemu-image/shared-store-script)[qemu-exec]:
    Wrap first element in ‘with-parameters’.
    
    Change-Id: Iab9905aaa7e80bad0372c1ee7c3ea88a89564f8f
---
 gnu/system/vm.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 7d9d07ebb7..a2743453e7 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -287,8 +287,11 @@ useful when FULL-BOOT?  is true."
       #~(format #f "/tmp/guix-image-~a" (basename #$base-image)))
 
     (define qemu-exec
-      #~(list #+(file-append qemu "/bin/"
-                             (qemu-command (or target system)))
+      #~(list #+(with-parameters ((%current-system %system)
+                                  (%current-target-system #f))
+                  ;; Override %CURRENT-SYSTEM to always use a native emulator.
+                  (file-append qemu "/bin/"
+                               (qemu-command (or target system))))
               ;; Tells qemu to use the terminal it was started in for IO.
               #$@(if graphic? '() #~("-nographic"))
               #$@(if full-boot?