all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
To: 69899@debbugs.gnu.org
Subject: [bug#69899] [PATCH 2/2] vm: Don't add -enable-kvm when SYSTEM and %system are not same.
Date: Mon, 15 Apr 2024 23:33:38 +0800	[thread overview]
Message-ID: <fbdee02737458f99e9e7d3116e3e828c8f204bf8.1713194805.git.zhengjunjie@iscas.ac.cn> (raw)
In-Reply-To: <4d858dc7d62800138c0d8fd78c598c9a89044662.1713194805.git.zhengjunjie@iscas.ac.cn>

* gnu/system/vm.scm (common-qemu-options): Don't add -enable-kvm when SYSTEM
and %system are not same.

Change-Id: Ie6c602b297c39423a693fdc26bed1627266e5911
---
 gnu/system/vm.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 2d1a4a9df1..b7ee5f8d42 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -212,7 +212,8 @@ (define* (virtualized-operating-system os
 (define* (common-qemu-options image shared-fs
                               #:key
                               rw-image?
-                              (target (%current-target-system)))
+                              (target (%current-target-system))
+                              (system (%current-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."
 
@@ -223,7 +224,9 @@ (define* (common-qemu-options image shared-fs
   #~(;; Only enable kvm if we see /dev/kvm exists.
      ;; This allows users without hardware virtualization to still use these
      ;; commands.
-     #$@(if (and (not target) (file-exists? "/dev/kvm"))
+     #$@(if (and (not target)
+                 (string=? system %system)
+                 (file-exists? "/dev/kvm"))
             '("-enable-kvm")
             '())
 
@@ -308,7 +311,8 @@ (define* (system-qemu-image/shared-store-script os
                                       (map file-system-mapping-source
                                            (cons %store-mapping mappings))
                                       #:rw-image? (not volatile?)
-                                      #:target target)
+                                      #:target target
+                                      #:system system)
               "-m " (number->string #$memory-size)
               #$@options))
 
-- 
2.41.0





      reply	other threads:[~2024-04-15 15:35 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-19 15:15 [bug#69899] [PATCH 0/7] support to use `guix system vm' with riscv64 Zheng Junjie
2024-03-19 15:18 ` [bug#69899] [PATCH 1/7] bootloader: Add u-boot-qemu-riscv64-bootloader Zheng Junjie
2024-03-19 15:18 ` [bug#69899] [PATCH 2/7] vm: use #$ for kernel-arguments Zheng Junjie
2024-03-19 15:18 ` [bug#69899] [PATCH 3/7] vm: When target riscv64-linux, use u-boot-qemu-riscv64-bootloader Zheng Junjie
2024-03-19 15:18 ` [bug#69899] [PATCH 4/7] gnu: linux-libre-riscv64-generic: add more options Zheng Junjie
2024-03-19 15:18 ` [bug#69899] [PATCH 5/7] linux-initrd: don't add hid-apple module for riscv64-linux Zheng Junjie
2024-03-19 15:18 ` [bug#69899] [PATCH 6/7] vm: add arguments to use virt machine type for qemu-riscv64 Zheng Junjie
2024-03-19 15:18 ` [bug#69899] [PATCH 7/7] vm: If not the same local architecture, don't enable kvm Zheng Junjie
2024-03-26 16:07 ` [bug#69899] [PATCH 0/7] support to use `guix system vm' with riscv64 Leo Famulari
2024-03-27  9:15   ` Zheng Junjie
2024-03-31 21:02     ` Ludovic Courtès
2024-04-01 17:20       ` Zheng Junjie
2024-04-03 22:42         ` Leo Famulari
2024-04-16 17:04         ` Ludovic Courtès
2024-03-31 21:03 ` bug#69899: " Ludovic Courtès
2024-04-15 15:33 ` [bug#69899] [PATCH 1/2] vm: override %CURRENT-SYSTEM to always use a native emulator Zheng Junjie
2024-04-15 15:33   ` Zheng Junjie [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=fbdee02737458f99e9e7d3116e3e828c8f204bf8.1713194805.git.zhengjunjie@iscas.ac.cn \
    --to=zhengjunjie@iscas.ac.cn \
    --cc=69899@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.