[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#69899] [PATCH 0/7] support to use `guix system vm' with riscv64.
From: |
Ludovic Courtès |
Subject: |
[bug#69899] [PATCH 0/7] support to use `guix system vm' with riscv64. |
Date: |
Sun, 31 Mar 2024 23:02:54 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
Hi,
Zheng Junjie <zhengjunjie@iscas.ac.cn> skribis:
> Leo Famulari <leo@famulari.name> writes:
>
>> Hi, thanks for these patches!
>>
>> On Tue, Mar 19, 2024 at 11:15:53PM +0800, Zheng Junjie wrote:
>>> hello!. this patchset make `guix system vm --target=riscv64-linux-gnu' work.
>>> and `guix system vm --system=riscv64-linux` also work, But there is a
>>> problem
>>> that the qemu running with --system=riscv64-linux is also riscv
>>> architecture,
>>> now you have to manually modify to use native qemu or the guix of
>>> qemu-system
>>> on qemu-user is too slow. and must enable qemu-binfmt.
>>
>> So, what should we do about the problem? What's the ideal solution for
>> Guix? I don't have any experience with this subject matter.
>
> I've come up with two ideas:
>
> 1. Force the current system's qemu to be used, on x86_64 and -s
> riscv64-linux, use x86_64's qemu.
> 2. add an environment variable, GUIX_QEMU, to allow the internal qemu
> execution to be replaced
>
> There may be other solutions, but I can't think of them yet.
Thing is, ‘--system=X’ is supposed to be giving the exact same result as
if you were building natively on X. Thus, it’s not surprising that
‘guix system vm --system=X’ gives on a QEMU binary built for X.
Now, it’s admittedly not very useful in this case. I believe the
attached patch implements #1 (I wasn’t able to test it yet because too
many things had to be built). How does it sound?
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 @@ (define* (system-qemu-image/shared-store-script os
#~(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?
Thanks,
Ludo’.
- [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, 2024/03/19
- [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