[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#69899] [PATCH 7/7] vm: If not the same local architecture, don't en
From: |
Zheng Junjie |
Subject: |
[bug#69899] [PATCH 7/7] vm: If not the same local architecture, don't enable kvm. |
Date: |
Tue, 19 Mar 2024 23:18:41 +0800 |
* gnu/system/vm.scm (common-qemu-options): Add target keyword.
Change-Id: Ic9bf18cf60ac5ce623289df31ea050a22c6e604e
---
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 @@ (define* (virtualized-operating-system os
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 @@ (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 (file-exists? "/dev/kvm")
+ #$@(if (and (not target) (file-exists? "/dev/kvm"))
'("-enable-kvm")
'())
@@ -302,7 +304,8 @@ (define* (system-qemu-image/shared-store-script os
#$@(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))
--
2.41.0
- [bug#69899] [PATCH 0/7] support to use `guix system vm' with riscv64., Zheng Junjie, 2024/03/19
- [bug#69899] [PATCH 2/7] vm: use #$ for kernel-arguments., Zheng Junjie, 2024/03/19
- [bug#69899] [PATCH 7/7] vm: If not the same local architecture, don't enable kvm.,
Zheng Junjie <=
- [bug#69899] [PATCH 5/7] linux-initrd: don't add hid-apple module for riscv64-linux., Zheng Junjie, 2024/03/19
- [bug#69899] [PATCH 1/7] bootloader: Add u-boot-qemu-riscv64-bootloader., Zheng Junjie, 2024/03/19
- [bug#69899] [PATCH 4/7] gnu: linux-libre-riscv64-generic: add more options., Zheng Junjie, 2024/03/19
- [bug#69899] [PATCH 6/7] vm: add arguments to use virt machine type for qemu-riscv64., Zheng Junjie, 2024/03/19
- [bug#69899] [PATCH 3/7] vm: When target riscv64-linux, use u-boot-qemu-riscv64-bootloader., Zheng Junjie, 2024/03/19
- [bug#69899] [PATCH 0/7] support to use `guix system vm' with riscv64., Leo Famulari, 2024/03/26
- bug#69899: [PATCH 0/7] support to use `guix system vm' with riscv64., Ludovic Courtès, 2024/03/31