Received: (at 69899) by debbugs.gnu.org; 2 Apr 2024 15:41:08 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Apr 02 11:41:08 2024
Received: from localhost ([127.0.0.1]:55027 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rrgG4-0001DR-9q
for submit <at> debbugs.gnu.org; Tue, 02 Apr 2024 11:41:08 -0400
Received: from smtp81.cstnet.cn ([159.226.251.81]:39484 helo=cstnet.cn)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zhengjunjie@HIDDEN>) id 1rrgFz-0001C7-MS
for 69899 <at> debbugs.gnu.org; Tue, 02 Apr 2024 11:41:06 -0400
Received: from m (unknown [111.0.51.68])
by APP-03 (Coremail) with SMTP id rQCowADnCCb+JgxmeS0BAQ--.25712S2;
Tue, 02 Apr 2024 23:40:48 +0800 (CST)
References: <cover.1710861023.git.zhengjunjie@HIDDEN>
<ZgLy0pJPuDtnOz83@HIDDEN> <87ttksgheo.fsf@HIDDEN>
<877chidsht.fsf@HIDDEN>
User-agent: mu4e 1.10.8; emacs 30.0.50
From: Zheng Junjie <zhengjunjie@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: [bug#69899] [PATCH 0/7] support to use `guix system vm' with
riscv64.
Date: Tue, 02 Apr 2024 01:20:12 +0800
In-reply-to: <877chidsht.fsf@HIDDEN>
Message-ID: <87zfub3h8l.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-CM-TRANSID: rQCowADnCCb+JgxmeS0BAQ--.25712S2
X-Coremail-Antispam: 1UD129KBjvJXoW7WrWfWryrtr1DCrWkKF17KFg_yoW8Xw4UpF
4SgF42kF4DGrySyrnFgr17ZFyxtrWjkw13WFykA3yrG3s09rnFvrnayF48Cr98Gr1Fg3W2
yFyjva43Xa4DA3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2
9KBjDU0xBIdaVrnRJUUUvFb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2
0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vE77IFxV
W8XVW5AwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE
14v26r1j6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aV
AFwI0_Cr1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x0
82IY62kv0487M2AExVA0xI801c8C04v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7
IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U
M4x0Y48IcVAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I
0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWU
XVWUAwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcV
CY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAF
wI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyTuYvj
xUgg_TUUUUU
X-Originating-IP: [111.0.51.68]
X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/
X-Spam-Score: 0.8 (/)
X-Debbugs-Envelope-To: 69899
Cc: 69899 <at> debbugs.gnu.org, Leo Famulari <leo@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.2 (/)
--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Ludovic Court=C3=A8s <ludo@HIDDEN> writes:
> Hi,
>
> Zheng Junjie <zhengjunjie@HIDDEN> skribis:
>
>> Leo Famulari <leo@HIDDEN> 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=3Driscv64-linux-gn=
u' work.
>>>> and `guix system vm --system=3Driscv64-linux` also work, But there is =
a problem
>>>> that the qemu running with --system=3Driscv64-linux is also riscv arch=
itecture,
>>>> 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, =E2=80=98--system=3DX=E2=80=99 is supposed to be giving the exa=
ct same result as
> if you were building natively on X. Thus, it=E2=80=99s not surprising th=
at
> =E2=80=98guix system vm --system=3DX=E2=80=99 gives on a QEMU binary buil=
t for X.
>
> Now, it=E2=80=99s admittedly not very useful in this case. I believe the
> attached patch implements #1 (I wasn=E2=80=99t able to test it yet becaus=
e too
> many things had to be built). How does it sound?
it works, and the following patch is required.
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment;
filename=0001-vm-Don-t-add-enable-kvm-when-SYSTEM-and-system-are-n.patch
Content-Transfer-Encoding: quoted-printable
From=20e178de931859399abdd4bd3300b7ce7c5593a6e3 Mon Sep 17 00:00:00 2001
Message-ID: <e178de931859399abdd4bd3300b7ce7c5593a6e3.1712026332.git.zhengj=
unjie@HIDDEN>
From: Zheng Junjie <zhengjunjie@HIDDEN>
Date: Tue, 2 Apr 2024 00:59:54 +0800
Subject: [PATCH] vm: Don't add -enable-kvm when SYSTEM and %system are not
same.
* gnu/system/vm.scm (common-qemu-options): Don't add -enable-kvm when SYSTEM
and %system are not same.
Change-Id: Ie6c602b297c39423a693fdc26bed1627266e5911
=2D--
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 a2743453e7..42e9a08722 100644
=2D-- 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?
=2D (target (%current-target-system)))
+ (target (%current-target-system))
+ (system (%current-system)))
"Return the a string-value gexp with the common QEMU options to boot IMA=
GE,
with '-virtfs' options for the host file systems listed in SHARED-FS."
=20
@@ -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 the=
se
;; commands.
=2D #$@(if (and (not target) (file-exists? "/dev/kvm"))
+ #$@(if (and (not target)
+ (string=3D? system %system)
+ (file-exists? "/dev/kvm"))
'("-enable-kvm")
'())
=20
@@ -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?)
=2D #:target target)
+ #:target target
+ #:system system)
"-m " (number->string #$memory-size)
#$@options))
=20
base-commit: 9e9ec741d0dc5ce58f8d21d31800ff2cafce128f
prerequisite-patch-id: 6183d199c58355eea1a85e1f1fe51f2f5fe44f65
=2D-=20
2.41.0
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
And maybe shebang interpreter also need override %CURRENT-SYSTEM?[1]
Even though when the Shebang interpreter cannot execute, the file will
be interpreted and executed by the current shell.
>
> 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)))
>=20=20
> (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 emu=
lator.
> + (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=E2=80=99.
[1] https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/system/vm.scm?h=3D9=
e9ec741d0dc5ce58f8d21d31800ff2cafce128f#n328
--=-=-=--
--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmYMJvoACgkQO1qpk+Gi
3/C23w/+KC2fwYpU3+FQ1LHIu/gi2aUcZR/FUn6qTbCZ6fhwaps6zYFQaQulhwxM
SftFfDcZ0PuOA+stY+7nHKKvM8pshOA9nOTtifCeddFO++FZ0jcX2YqDBVSvcVnS
ZWKgnPXj7ryq0ld8C5oqQMuF/NmEoGKZJPLHqfa64qtHbVzEjLcJ94d/MmhPofcY
rT1FOlp0ozcQfBUntkOcs5aMUfDgbtN22ufVsCuLthTPXgKJgu5udKODN8g4qOE6
NHcJtN2uVqDII/7TQ9L4jw3Qp5N+WiU5fvitSviIMpWgBfBzrTOTymBHiDqeNzvv
UMvWgQpxpsh7eiUrWGfHqgIR2IH1CTyo0k9qmYDcrDrmwMKIyZ5BNJgCjeMrVt8J
0nJ1TJXHmHafV9/tjHW0El6U0gtw/2mNCoBe+6Qz3hzejEgspmUqHY9zzuHpP6CE
EtmA9SlrIt77mb8wcRdVk1xzboM+2CYb87ubL3okDpTZ5A4nAabb/knY629x1v/8
cmAPze2Xaoh/GsROaRyneX4wG6mHm43lZ/f18LDC9r3vBYw7ZJO3OZfjwRyxo5Is
CgfHhV8esH99z37UC34FZEFpgtdWHa2Q9nirE/bP+0HegvdrgG06VtVjV5G+rQjf
cO8r5Y0H/S5YHyzWopc6cOFw7OiQAWMBy/ibTlIRDyc1DO1NqwU=
=BIfo
-----END PGP SIGNATURE-----
--==-=-=--
guix-patches@HIDDEN:bug#69899; Package guix-patches.
Full text available.Received: (at 69899-done) by debbugs.gnu.org; 31 Mar 2024 21:03:37 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Mar 31 17:03:37 2024 Received: from localhost ([127.0.0.1]:48674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rr2L3-0004GQ-9b for submit <at> debbugs.gnu.org; Sun, 31 Mar 2024 17:03:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1rr2L2-0004G1-6F for 69899-done <at> debbugs.gnu.org; Sun, 31 Mar 2024 17:03:36 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1rr2Ku-0000tT-5T; Sun, 31 Mar 2024 17:03:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=dm8h+GQiWBB5Av6BBnj6ITGN0Y5YPTtFxqrNDjj2IrI=; b=ms7zLtq0SITLPwktbQOI 3Q9znfiXJw92N0ZAUo5Hn9nrXUga5NSHcjM9DH7PSDHgkz34xkMszaGEO8OBOU0vTC0W2s/qBcPHn YbPbR87lBeiZbzK6Fcd+G3TUx58ln8vO3v7XwJgikbzijZQU3bMZ82kfAsr8pC7u5jEmABPi9xw8f 9IviLT7RmTwW1zxbGblB+MlN+hAgIn9MwUiK2NZyXq9PKXghJlC02JyQlx2pf4QOg27F3b95QrXTL yrgVz+YasG0b55YyzDwF6+9O5laOq60Bvht477bi4WhiVNylwevoigLYauTNTWMkv/k5oxwbbJFHT 2IRRRIE/bDkLmQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Zheng Junjie <zhengjunjie@HIDDEN> Subject: Re: [bug#69899] [PATCH 0/7] support to use `guix system vm' with riscv64. In-Reply-To: <cover.1710861023.git.zhengjunjie@HIDDEN> (Zheng Junjie's message of "Tue, 19 Mar 2024 23:15:53 +0800") References: <cover.1710861023.git.zhengjunjie@HIDDEN> Date: Sun, 31 Mar 2024 23:03:20 +0200 Message-ID: <8734s6dsh3.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 69899-done Cc: 69899-done <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hi, Zheng Junjie <zhengjunjie@HIDDEN> skribis: > bootloader: Add u-boot-qemu-riscv64-bootloader. > vm: use #$ for kernel-arguments. > vm: When target riscv64-linux, use u-boot-qemu-riscv64-bootloader. > gnu: linux-libre-riscv64-generic: add more options. > linux-initrd: don't add hid-apple module for riscv64-linux. > vm: add arguments to use virt machine type for qemu-riscv64. > vm: If not the same local architecture, don't enable kvm. Applied, thanks! Ludo=E2=80=99.
Zheng Junjie <zhengjunjie@HIDDEN>:Ludovic Courtès <ludo@HIDDEN>:
Received: (at 69899) by debbugs.gnu.org; 31 Mar 2024 21:03:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Mar 31 17:03:13 2024
Received: from localhost ([127.0.0.1]:48669 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rr2Ke-0004F6-RY
for submit <at> debbugs.gnu.org; Sun, 31 Mar 2024 17:03:13 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:59050)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ludo@HIDDEN>) id 1rr2Kc-0004Er-Cx
for 69899 <at> debbugs.gnu.org; Sun, 31 Mar 2024 17:03:11 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
id 1rr2KQ-0000Ze-GY; Sun, 31 Mar 2024 17:02:58 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=/CYaAXR0EMJdYlZoawXK3WUjkLyRucjOsXIdlNiaM5Y=; b=j627qe+cosXLIwxKXxtR
lAeRc4ux3Ive75Aw41m4cyWnbbEiHyIB+CTAUgtjyMrAFlnIDAIAot0MrvXEPLgon0t6hzTOx4fzF
qo6IH2eC0ofGpGTTUbYNvhLBZgcvhrveOY7f6qSIpie1teQaCZN51qlxnZzIA/1CewRssLIgfhW9j
fE4U5bUQAZmIciGbaXUJCddVsMBh+F962ZfDBVeba4fCc/MxZEzxt0yDMuY+8Wn+r5jV4ZIAjkgt8
CBgF2iLZd6wrnKVggG5OBNE5YuaoZluGHGAr1jEc2/KWpDzR6Ag+VjAuxsQwTnw+PxlbtWgy6Yjmy
yu0a50T3K9XP8Q==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Zheng Junjie <zhengjunjie@HIDDEN>
Subject: Re: [bug#69899] [PATCH 0/7] support to use `guix system vm' with
riscv64.
In-Reply-To: <87ttksgheo.fsf@HIDDEN> (Zheng Junjie's message of "Wed, 27
Mar 2024 17:15:26 +0800")
References: <cover.1710861023.git.zhengjunjie@HIDDEN>
<ZgLy0pJPuDtnOz83@HIDDEN> <87ttksgheo.fsf@HIDDEN>
Date: Sun, 31 Mar 2024 23:02:54 +0200
Message-ID: <877chidsht.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 69899
Cc: 69899 <at> debbugs.gnu.org, Leo Famulari <leo@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Hi,
Zheng Junjie <zhengjunjie@HIDDEN> skribis:
> Leo Famulari <leo@HIDDEN> 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=3Driscv64-linux-gnu=
' work.
>>> and `guix system vm --system=3Driscv64-linux` also work, But there is a=
problem
>>> that the qemu running with --system=3Driscv64-linux is also riscv archi=
tecture,
>>> 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, =E2=80=98--system=3DX=E2=80=99 is supposed to be giving the exact=
same result as
if you were building natively on X. Thus, it=E2=80=99s not surprising that
=E2=80=98guix system vm --system=3DX=E2=80=99 gives on a QEMU binary built =
for X.
Now, it=E2=80=99s admittedly not very useful in this case. I believe the
attached patch implements #1 (I wasn=E2=80=99t able to test it yet because =
too
many things had to be built). How does it sound?
--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline
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?
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: base64
DQpUaGFua3MsDQpMdWRv4oCZLg0K
--=-=-=--
guix-patches@HIDDEN:bug#69899; Package guix-patches.
Full text available.Received: (at 69899) by debbugs.gnu.org; 27 Mar 2024 09:20:53 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Mar 27 05:20:53 2024 Received: from localhost ([127.0.0.1]:35766 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rpPSn-0006qZ-20 for submit <at> debbugs.gnu.org; Wed, 27 Mar 2024 05:20:53 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81]:35728 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <zhengjunjie@HIDDEN>) id 1rpPSj-0006ph-8B for 69899 <at> debbugs.gnu.org; Wed, 27 Mar 2024 05:20:51 -0400 Received: from m (unknown [183.247.5.22]) by APP-03 (Coremail) with SMTP id rQCowACXnOTj5ANmttUDCQ--.20135S2; Wed, 27 Mar 2024 17:20:36 +0800 (CST) References: <cover.1710861023.git.zhengjunjie@HIDDEN> <ZgLy0pJPuDtnOz83@HIDDEN> User-agent: mu4e 1.10.8; emacs 30.0.50 From: Zheng Junjie <zhengjunjie@HIDDEN> To: Leo Famulari <leo@HIDDEN> Subject: Re: [bug#69899] [PATCH 0/7] support to use `guix system vm' with riscv64. Date: Wed, 27 Mar 2024 17:15:26 +0800 In-reply-to: <ZgLy0pJPuDtnOz83@HIDDEN> Message-ID: <87ttksgheo.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: rQCowACXnOTj5ANmttUDCQ--.20135S2 X-Coremail-Antispam: 1UD129KBjvdXoW7Xr4fAr4kJw15tw17JFWxCrg_yoWftrc_CF Z5ZFn2kw4fXFy7ta1rtF1aqF42gr97Ja48Ww47KrWIqr93WFnxJan0krs7J34UGayFkFnr Zrs0y34Fqry2qjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb7xYjsxI4VWDJwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I 8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21le4C267I2x7xF 54xIwI1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I 8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IY64vIr41l42xK82IY c2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s 026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1Y6r17MIIYrxkI7VAKI48JMIIF 0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0x vE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv 6xkF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x07jY6wZUUUUU= X-Originating-IP: [183.247.5.22] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69899 Cc: 69899 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Leo Famulari <leo@HIDDEN> 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. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmYD5N8ACgkQO1qpk+Gi 3/CN5w/+JtBauA6LnRD0wSDmkxuYo/8Jyy1kJkKREu2RXeJxH2koif3k+XvRf/81 LAZ1dfSgtOPJ8p0mlQAVTWOqx/+fppQhoBDe2QgGQ3rtHZLQScqY8s1MDuab92P1 OflJTKWSs94KdDTsx7OnzvkFOUR5/FLv8gldFt3YEppiCy+SDc4UvebM8iJXZwP/ qb4dRGzylgh5m10yW/P8AXY4nvUB/RINakqoUcwOjqPSYJdJVhu1x0vJaJqx4r0M 88GnI4yRIfh/qLojJUHoaKUodPMVRmp5QCu26zGBaKqBA5cId38sKy6mcv4aXQcd aZb24iEbst/Pb/F0MBR6pJ4UaHI6DVYwQUcMQgFNAKZTvTLTIfh8tyXUqyuRrlUF zR+WlLCR8Hn3xVdVt5rG4i8JfqfcL2t5J0ZC2ag2VnRLwQ7KT4LKqW3TriIy+ILp Stl959O6QR9ZzuudoMVm0aIXCxllW/xeFAj9hoCU5HSnEbkoQjdLoIxbVupyOx2x GxJZzfw2as5OgTMlMDEnxFvWyd7zTJHbNJ1o98pXy+AIjxm4BhDJtIfE96PItjga y/aPz/ExNRTO4Vk0RDLSkwK7DRg0zKE2BJW1zP2H5ZJg/1My+qQuqOWUtGYMKx9i xMhCILbAGMK6SvUku2ddFzczAIQ1NVkrcYt3RkWxAm5slAWt2U8= =WqCt -----END PGP SIGNATURE----- --=-=-=--
guix-patches@HIDDEN:bug#69899; Package guix-patches.
Full text available.Received: (at 69899) by debbugs.gnu.org; 26 Mar 2024 16:08:00 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 26 12:08:00 2024 Received: from localhost ([127.0.0.1]:34675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rp9LE-0003m1-Dc for submit <at> debbugs.gnu.org; Tue, 26 Mar 2024 12:08:00 -0400 Received: from fout4-smtp.messagingengine.com ([103.168.172.147]:44895) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <leo@HIDDEN>) id 1rp9L8-0003lY-Pt for 69899 <at> debbugs.gnu.org; Tue, 26 Mar 2024 12:07:58 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.nyi.internal (Postfix) with ESMTP id ACC0E13800E8; Tue, 26 Mar 2024 12:07:49 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Tue, 26 Mar 2024 12:07:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:cc:content-type:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=mesmtp; t=1711469269; x= 1711555669; bh=JAGXoc80p5lGud3C4AlE8IsL5Pe90EobsTOKmKlgJIs=; b=n dk9HFaa4UXnLccIjKchrVmKbc2P2hyEKWeKrD2F6Dwmwd7/YP7ZebIekamUwTU+a ukcQhq5pT0r2BoZ2fu+ramSEL4sN1Zd0u1xXiMYJRtyxrpWiZFvJrlZyIqRGivk6 goRr0XQk6JCccAYrXErGjIEiK6CobA5hc75nfAA0PU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1711469269; x=1711555669; bh=JAGXoc80p5lGud3C4AlE8IsL5Pe9 0EobsTOKmKlgJIs=; b=l92FJ9xNCv8iUYgO9VvSReOBkkCj3VBpBO6ok0GKV5uO odjkhIXYE++owo2K99y0WcyLvIIuwQaNYvOxO+/8soeDvMrvRA+YLXI0GecpqT+i bVFUuy8DKpr7Gj2LDDXKxkb1EZKG0kvo7tytYB4/BgRf4jEIW4o6w15VbFCJNZ1l O2JrJ4pqrEWxck1ehQIWx0piUnyl0Oko8Dhi63CqwXcqIIDNVPwI6809Wm9yqI2u xm+9WZhhFnnzZbxuwFhndO+AavbJJMfurWBA3gZO6dGaQzB1TDPLfnCiCRLavtmw cbERTZT3Blz+E1MpUyJLHOya6Xd+OgABasls+7pMww== X-ME-Sender: <xms:1fICZqR9z27rYwMufWeabbViqhytBGhcxBN3F-6r16Dfbic4LAqheg> <xme:1fICZvzyX-zXqjbQuHC71Tb1JtrDIxTXPdAMKkEImPpKkEE9MfAZtEGzsEXc2H9D8 ivk3vTT9MdMmaOfZg> X-ME-Received: <xmr:1fICZn012Vg70__KFPDCskPLOdd7yqqx5Bwb4tIsCMXgVtX7YrbVl7AastxQT7_mj055TFgZBic-2ogMvhjRC8dv> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddufedgkeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepnfgvohcu hfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrth htvghrnhepieetudehfeekueefleegudfhjefgleehfeeluefhfeffgfeuudelhedvjeel ieetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplh gvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: <xmx:1fICZmCAqfQzAVOYDurDS40MGQocFurwwW1SIyym1rDTv8P2aNiJSA> <xmx:1fICZjitRUrz7CnNPu9h8hzhOCSAqwWcXGcF47LzAUL4QOGPeDkhWw> <xmx:1fICZiqt0fkU-fImidQme3V9Mgn5YMq9S69sUiKNPuBzctRp0l_0rQ> <xmx:1fICZmgIMEG9AGvu87Ls8iwuZ_lR-S3sU7gg8Hcev-v-VnGTEaMPLQ> <xmx:1fICZgvOTnFI8Jw68n7McKXTconMQhaSaaEBArVC3WN9lpllJy6OJw> Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 26 Mar 2024 12:07:48 -0400 (EDT) Date: Tue, 26 Mar 2024 12:07:46 -0400 From: Leo Famulari <leo@HIDDEN> To: Zheng Junjie <zhengjunjie@HIDDEN> Subject: Re: [bug#69899] [PATCH 0/7] support to use `guix system vm' with riscv64. Message-ID: <ZgLy0pJPuDtnOz83@HIDDEN> References: <cover.1710861023.git.zhengjunjie@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <cover.1710861023.git.zhengjunjie@HIDDEN> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69899 Cc: 69899 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) 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.
guix-patches@HIDDEN:bug#69899; Package guix-patches.
Full text available.
Received: (at 69899) by debbugs.gnu.org; 19 Mar 2024 15:25:19 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 19 11:25:19 2024
Received: from localhost ([127.0.0.1]:51150 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rmbL4-0001B6-Fz
for submit <at> debbugs.gnu.org; Tue, 19 Mar 2024 11:25:19 -0400
Received: from smtp84.cstnet.cn ([159.226.251.84]:51170 helo=cstnet.cn)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zhengjunjie@HIDDEN>) id 1rmbFZ-0000gB-KM
for 69899 <at> debbugs.gnu.org; Tue, 19 Mar 2024 11:19:44 -0400
Received: from m.taildaf0f.ts.net (unknown [183.247.5.22])
by APP-05 (Coremail) with SMTP id zQCowAAnLLzZrPlljqBBBw--.46102S2;
Tue, 19 Mar 2024 23:18:49 +0800 (CST)
From: Zheng Junjie <zhengjunjie@HIDDEN>
To: 69899 <at> debbugs.gnu.org
Subject: [PATCH 1/7] bootloader: Add u-boot-qemu-riscv64-bootloader.
Date: Tue, 19 Mar 2024 23:18:35 +0800
Message-ID: <560d073808f3cda2f330a0b30bf2f59b79f21fbd.1710861023.git.zhengjunjie@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1710861023.git.zhengjunjie@HIDDEN>
References: <cover.1710861023.git.zhengjunjie@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=y
Content-Transfer-Encoding: 8bit
X-CM-TRANSID: zQCowAAnLLzZrPlljqBBBw--.46102S2
X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73
VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUY-7k0a2IF6F4UM7kC6x804xWl14x267AK
xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw
A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j
6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Gc
CE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxI
r21le4C262xC7I0v67AEwI8IwI1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x
vE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv
r2IYc2Ij64vIr41lw4CEx2IqxVAFz4v204v26I0v724l42xK82IYc2Ij64vIr41l4I8I3I
0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU
JVWUGwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI
0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0
rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r
4UYxBIdaVFxhVjvjDU0xZFpf9x07jbManUUUUU=
X-Originating-IP: [183.247.5.22]
X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 69899
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/bootloader/u-boot.scm (u-boot-qemu-riscv64-bootloader): New variable.
Change-Id: If6622838d2250c90a26380849b92387aa7122fbb
---
gnu/bootloader/u-boot.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm
index d20aabd538..8e7cc05191 100644
--- a/gnu/bootloader/u-boot.scm
+++ b/gnu/bootloader/u-boot.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
;;; Copyright © 2023 Efraim Flashner <efraim@HIDDEN>
;;; Copyright © 2023 Herman Rimm <herman_rimm@HIDDEN>
+;;; Copyright © 2024 Zheng Junjie <873216071@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -47,6 +48,7 @@ (define-module (gnu bootloader u-boot)
u-boot-rock64-rk3328-bootloader
u-boot-rockpro64-rk3399-bootloader
u-boot-sifive-unmatched-bootloader
+ u-boot-qemu-riscv64-bootloader
u-boot-ts7970-q-2g-1000mhz-c-bootloader
u-boot-wandboard-bootloader))
@@ -157,6 +159,12 @@ (define install-sifive-unmatched-u-boot
(write-file-on-device u-boot (stat:size (stat u-boot))
image (* 2082 512)))))
+(define install-qemu-riscv64-u-boot
+ #~(lambda (bootloader device mount-point)
+ (let ((u-boot.bin (string-append bootloader "/libexec/u-boot.bin"))
+ (install-dir (string-append mount-point "/boot")))
+ (install-file u-boot.bin install-dir))))
+
;;;
@@ -307,3 +315,10 @@ (define u-boot-sifive-unmatched-bootloader
(inherit u-boot-bootloader)
(package u-boot-sifive-unmatched)
(disk-image-installer install-sifive-unmatched-u-boot)))
+
+(define u-boot-qemu-riscv64-bootloader
+ (bootloader
+ (inherit u-boot-bootloader)
+ (package u-boot-qemu-riscv64)
+ (installer install-qemu-riscv64-u-boot)
+ (disk-image-installer #f)))
--
2.41.0
guix-patches@HIDDEN:bug#69899; Package guix-patches.
Full text available.
Received: (at 69899) by debbugs.gnu.org; 19 Mar 2024 15:25:18 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 19 11:25:18 2024
Received: from localhost ([127.0.0.1]:51148 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rmbL4-0001Az-1k
for submit <at> debbugs.gnu.org; Tue, 19 Mar 2024 11:25:18 -0400
Received: from smtp84.cstnet.cn ([159.226.251.84]:51192 helo=cstnet.cn)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zhengjunjie@HIDDEN>) id 1rmbFa-0000gG-KK
for 69899 <at> debbugs.gnu.org; Tue, 19 Mar 2024 11:19:43 -0400
Received: from m.taildaf0f.ts.net (unknown [183.247.5.22])
by APP-05 (Coremail) with SMTP id zQCowAAnLLzZrPlljqBBBw--.46102S4;
Tue, 19 Mar 2024 23:18:50 +0800 (CST)
From: Zheng Junjie <zhengjunjie@HIDDEN>
To: 69899 <at> debbugs.gnu.org
Subject: [PATCH 3/7] vm: When target riscv64-linux,
use u-boot-qemu-riscv64-bootloader.
Date: Tue, 19 Mar 2024 23:18:37 +0800
Message-ID: <528b248a19b9debbaad5181749f49f5aa4e82f77.1710861023.git.zhengjunjie@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1710861023.git.zhengjunjie@HIDDEN>
References: <cover.1710861023.git.zhengjunjie@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-CM-TRANSID: zQCowAAnLLzZrPlljqBBBw--.46102S4
X-Coremail-Antispam: 1UD129KBjvJXoW7Ary8Ww4kCFWDtr4kuFyUZFb_yoW8KF4rpF
s5Za4Skw45GrW3Zw40gF9rKr1aqryvy3y5Aa4fuw1Fv3W5uryv9r13ta45JayUX34fCr18
Ary8tr15uryDXr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2
9KBjDU0xBIdaVrnRJUUUvEb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2
0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI
8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kE
wVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0cI8IcVCY1x
0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x02
67AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I
80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCj
c4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4
AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE
17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMI
IF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4l
IxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWI
evJa73UjIFyTuYvjxUqqYpUUUUU
X-Originating-IP: [183.247.5.22]
X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 69899
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/system/vm.scm (virtualized-operating-system) When target riscv64-linux,
use u-boot-qemu-riscv64-bootloader. Add system, target keyword.
Change-Id: I22d64d00670a705e4b81427e44a83d504598b536
---
gnu/system/vm.scm | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 40e965d272..d4044a4a39 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -52,6 +52,7 @@ (define-module (gnu system vm)
#:use-module (gnu bootloader)
#:use-module (gnu bootloader grub)
+ #:use-module (gnu bootloader u-boot)
#:use-module (gnu image)
#:use-module (gnu system image)
#:use-module (gnu system linux-container)
@@ -137,7 +138,9 @@ (define (mapping->file-system mapping)
(define* (virtualized-operating-system os
#:optional (mappings '())
- #:key (full-boot? #f) volatile?)
+ #:key (full-boot? #f) volatile?
+ (system (%current-system))
+ (target (%current-target-system)))
"Return an operating system based on OS suitable for use in a virtualized
environment with the store shared with the host. MAPPINGS is a list of
<file-system-mapping> to realize in the virtualized OS."
@@ -167,15 +170,18 @@ (define* (virtualized-operating-system os
(append (map mapping->file-system mappings)
user-file-systems)))
- (operating-system (inherit os)
-
+ (operating-system
+ (inherit os)
;; XXX: Until we run QEMU with UEFI support (with the OVMF firmware),
;; force the traditional i386/BIOS method.
;; See <https://bugs.gnu.org/28768>.
(bootloader (bootloader-configuration
- (inherit (operating-system-bootloader os))
- (bootloader grub-bootloader)
- (targets '("/dev/vda"))))
+ (inherit (operating-system-bootloader os))
+ (bootloader
+ (if (target-riscv64? (or target system))
+ u-boot-qemu-riscv64-bootloader
+ grub-bootloader))
+ (targets '("/dev/vda"))))
(initrd (lambda (file-systems . rest)
(apply (operating-system-initrd os)
@@ -259,7 +265,9 @@ (define* (system-qemu-image/shared-store-script os
(mlet* %store-monad ((os -> (virtualized-operating-system
os mappings
#:full-boot? full-boot?
- #:volatile? volatile?))
+ #:volatile? volatile?
+ #:system system
+ #:target target))
(base-image -> (system-image
(image
(inherit
--
2.41.0
guix-patches@HIDDEN:bug#69899; Package guix-patches.
Full text available.
Received: (at 69899) by debbugs.gnu.org; 19 Mar 2024 15:25:18 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 19 11:25:18 2024
Received: from localhost ([127.0.0.1]:51146 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rmbL3-0001Ar-Hc
for submit <at> debbugs.gnu.org; Tue, 19 Mar 2024 11:25:18 -0400
Received: from smtp84.cstnet.cn ([159.226.251.84]:51184 helo=cstnet.cn)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zhengjunjie@HIDDEN>) id 1rmbFa-0000gE-5H
for 69899 <at> debbugs.gnu.org; Tue, 19 Mar 2024 11:19:43 -0400
Received: from m.taildaf0f.ts.net (unknown [183.247.5.22])
by APP-05 (Coremail) with SMTP id zQCowAAnLLzZrPlljqBBBw--.46102S7;
Tue, 19 Mar 2024 23:18:51 +0800 (CST)
From: Zheng Junjie <zhengjunjie@HIDDEN>
To: 69899 <at> debbugs.gnu.org
Subject: [PATCH 6/7] vm: add arguments to use virt machine type for
qemu-riscv64.
Date: Tue, 19 Mar 2024 23:18:40 +0800
Message-ID: <c1874f516878f4f6f8c3d1db7f5a84d1134b6a00.1710861023.git.zhengjunjie@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1710861023.git.zhengjunjie@HIDDEN>
References: <cover.1710861023.git.zhengjunjie@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-CM-TRANSID: zQCowAAnLLzZrPlljqBBBw--.46102S7
X-Coremail-Antispam: 1UD129KBjvdXoW7Xw1UZrWDZFy8Gr4rKF4xtFb_yoWfWrXEka
92qr92kFWrJF1Yyrs5Aa43Xan0qrs2g34Iqr47KFZFq3s5Zws5GF97Ar92vw1F9Fs7WF13
Crs7Xry3JrWUKjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT
9fnUUIcSsGvfJTRUUUbaxYjsxI4VWkCwAYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I
6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7
IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVWUXVWUCwA2ocxC64kIII0Yj41l84x0
c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1I6r4UM28EF7xvwVC0I7IYx2
IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv
6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c
02F40Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8JwAm72CE
4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4I
kC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWU
WwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JF
I_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWU
JVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYx
BIdaVFxhVjvjDU0xZFpf9x07jjdgAUUUUU=
X-Originating-IP: [183.247.5.22]
X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 69899
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/system/vm.scm (system-qemu-image/shared-store-script): When target
riscv64, add arguments to set qemu virt machine type.
Change-Id: I974c82fdd2d5bfc01caff9e6411db38e472b5cd4
---
gnu/system/vm.scm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index d4044a4a39..64cc321ebf 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -295,6 +295,10 @@ (define* (system-qemu-image/shared-store-script os
"-initrd" #$(file-append os "/initrd")
(format #f "-append ~s"
(string-join #$kernel-arguments " "))))
+ ;; Default qemu-riscv64 have not PCI, virt have it, so we set it.
+ #$@(if (target-riscv64? (or target system))
+ #~("-M" "virt")
+ #~())
#$@(common-qemu-options (if volatile? base-image rw-image)
(map file-system-mapping-source
(cons %store-mapping mappings))
--
2.41.0
guix-patches@HIDDEN:bug#69899; Package guix-patches.
Full text available.
Received: (at 69899) by debbugs.gnu.org; 19 Mar 2024 15:25:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 19 11:25:17 2024
Received: from localhost ([127.0.0.1]:51144 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rmbL2-0001Ak-Rl
for submit <at> debbugs.gnu.org; Tue, 19 Mar 2024 11:25:17 -0400
Received: from smtp84.cstnet.cn ([159.226.251.84]:51182 helo=cstnet.cn)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zhengjunjie@HIDDEN>) id 1rmbFa-0000gD-4y
for 69899 <at> debbugs.gnu.org; Tue, 19 Mar 2024 11:19:43 -0400
Received: from m.taildaf0f.ts.net (unknown [183.247.5.22])
by APP-05 (Coremail) with SMTP id zQCowAAnLLzZrPlljqBBBw--.46102S5;
Tue, 19 Mar 2024 23:18:51 +0800 (CST)
From: Zheng Junjie <zhengjunjie@HIDDEN>
To: 69899 <at> debbugs.gnu.org
Subject: [PATCH 4/7] gnu: linux-libre-riscv64-generic: add more options.
Date: Tue, 19 Mar 2024 23:18:38 +0800
Message-ID: <8d66e9e260397c834199f77d124f4e5841a60653.1710861023.git.zhengjunjie@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1710861023.git.zhengjunjie@HIDDEN>
References: <cover.1710861023.git.zhengjunjie@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Leo Famulari <leo@HIDDEN>,
Tobias Geerinckx-Rice <me@HIDDEN>, Wilko Meyer <w@HIDDEN>
Content-Transfer-Encoding: 8bit
X-CM-TRANSID: zQCowAAnLLzZrPlljqBBBw--.46102S5
X-Coremail-Antispam: 1UD129KBjvJXoW7Cr45tFWUKF13JFyxZw47urg_yoW8Jw15pr
s3JryY9r1rGrs3JrW3uF4vk3Z0qr4xAFWvyayxCr15CFy8ZaykX34DKr4Fyr9rXFWxCa17
uF1kKwnxua4UA3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2
9KBjDU0xBIdaVrnRJUUU9Yb7Iv0xC_Cr1lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2
0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI
8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28CjxkF
64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUCVW8JwA2z4x0Y4vE2Ix0cI8IcV
CY1x0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY
1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4
xG6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCa
FVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFV
Cjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWl
x4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r
1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_
JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCT
nIWIevJa73UjIFyTuYvjxUzxR6DUUUU
X-Originating-IP: [183.247.5.22]
X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 69899
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This is required by `guix system vm'.
* gnu/packages/linux (linux-libre-riscv64-generic)[#:extra-options]: Add more
option.
Change-Id: I5697ba7158d44ef0ea9cf28cadb4d59f312b4206
---
gnu/packages/linux.scm | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 343e8c1032..73b08fcf82 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1312,7 +1312,24 @@ (define-public linux-libre-riscv64-generic
linux-libre-gnu-revision
linux-libre-source
'("riscv64-linux")
- #:extra-version "riscv64-generic"))
+ #:extra-version "riscv64-generic"
+ #:extra-options
+ (append
+ ;; required `guix system vm'
+ `(("CONFIG_USB_HID" . m)
+ ("CONFIG_HID_GEMBIRD" . m)
+ ("CONFIG_AHCI_DWC" . m)
+ ("CONFIG_SATA_AHCI" . m)
+ ("CONFIG_CRYPTO_SERPENT" . m)
+ ("CONFIG_CRYPTO_WP512" . m)
+ ("CONFIG_USB_UAS" . m)
+ ("CONFIG_USB_STORAGE" . m)
+ ("CONFIG_HID_GENERIC" . m)
+ ("CONFIG_DRM_CIRRUS_QEMU" . m)
+ ("CONFIG_HW_RANDOM_VIRTIO" . m)
+ ("CONFIG_VIRTIO_CONSOLE" . m)
+ ("CONFIG_CRYPTO_XTS" . m))
+ %default-extra-linux-options)))
(define-public linux-libre-mips64el-fuloong2e
(make-linux-libre* linux-libre-version
--
2.41.0
leo@HIDDEN, me@HIDDEN, w@HIDDEN, guix-patches@HIDDEN:bug#69899; Package guix-patches.
Full text available.
Received: (at 69899) by debbugs.gnu.org; 19 Mar 2024 15:25:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 19 11:25:16 2024
Received: from localhost ([127.0.0.1]:51142 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rmbL0-0001AO-QF
for submit <at> debbugs.gnu.org; Tue, 19 Mar 2024 11:25:16 -0400
Received: from smtp84.cstnet.cn ([159.226.251.84]:51194 helo=cstnet.cn)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zhengjunjie@HIDDEN>) id 1rmbFb-0000gI-Je
for 69899 <at> debbugs.gnu.org; Tue, 19 Mar 2024 11:19:43 -0400
Received: from m.taildaf0f.ts.net (unknown [183.247.5.22])
by APP-05 (Coremail) with SMTP id zQCowAAnLLzZrPlljqBBBw--.46102S6;
Tue, 19 Mar 2024 23:18:51 +0800 (CST)
From: Zheng Junjie <zhengjunjie@HIDDEN>
To: 69899 <at> debbugs.gnu.org
Subject: [PATCH 5/7] linux-initrd: don't add hid-apple module for
riscv64-linux.
Date: Tue, 19 Mar 2024 23:18:39 +0800
Message-ID: <531cfd3b53b47867c80b30f69abef3bdcbf66c06.1710861023.git.zhengjunjie@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1710861023.git.zhengjunjie@HIDDEN>
References: <cover.1710861023.git.zhengjunjie@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-CM-TRANSID: zQCowAAnLLzZrPlljqBBBw--.46102S6
X-Coremail-Antispam: 1UD129KBjvdXoWruw1fAF43XF1UAF15Jr4fXwb_yoWDGwb_G3
s7WFs7JFWUXw4UAwnavw15XF1Ykr9293W3W3ZrXF4jgrWFqwn5uasxZrWxA348W3yxGFy3
JF4DJrySyr13WjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT
9fnUUIcSsGvfJTRUUUbaxYjsxI4VWDJwAYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I
6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7
IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVWUXVWUCwA2ocxC64kIII0Yj41l84x0
c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1I6r4UM28EF7xvwVC0I7IYx2
IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv
6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c
02F40Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8JwAm72CE
4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4I
kC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWU
WwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JF
I_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWU
JVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYx
BIdaVFxhVjvjDU0xZFpf9x07jjYL9UUUUU=
X-Originating-IP: [183.247.5.22]
X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 69899
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/system/linux-initrd.scm(default-initrd-modules): when target-riscv64,
don't add hid-apple module.
Change-Id: I633468421db0cb1ebd61e0603021fa1c79038473
---
gnu/system/linux-initrd.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index 6236d25b9d..f5d86219a8 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -363,7 +363,10 @@ (define* (default-initrd-modules
`("ahci" ;for SATA controllers
"usb-storage" "uas" ;for the installation image etc.
- "usbhid" "hid-generic" "hid-apple" ;keyboards during early boot
+ "usbhid" "hid-generic" ;keyboards during early boot
+ ,@(if (target-riscv64? system)
+ '()
+ '("hid-apple"))
"dm-crypt" "xts" "serpent_generic" "wp512" ;for encrypted root partitions
"nls_iso8859-1" ;for `mkfs.fat`, et.al
,@(if (string-match "^(x86_64|i[3-6]86)-" system)
--
2.41.0
guix-patches@HIDDEN:bug#69899; Package guix-patches.
Full text available.
Received: (at 69899) by debbugs.gnu.org; 19 Mar 2024 15:19:45 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 19 11:19:45 2024
Received: from localhost ([127.0.0.1]:51124 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rmbFg-0000iG-Td
for submit <at> debbugs.gnu.org; Tue, 19 Mar 2024 11:19:45 -0400
Received: from smtp84.cstnet.cn ([159.226.251.84]:51188 helo=cstnet.cn)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zhengjunjie@HIDDEN>) id 1rmbFa-0000gF-3r
for 69899 <at> debbugs.gnu.org; Tue, 19 Mar 2024 11:19:42 -0400
Received: from m.taildaf0f.ts.net (unknown [183.247.5.22])
by APP-05 (Coremail) with SMTP id zQCowAAnLLzZrPlljqBBBw--.46102S8;
Tue, 19 Mar 2024 23:18:52 +0800 (CST)
From: Zheng Junjie <zhengjunjie@HIDDEN>
To: 69899 <at> debbugs.gnu.org
Subject: [PATCH 7/7] vm: If not the same local architecture, don't enable kvm.
Date: Tue, 19 Mar 2024 23:18:41 +0800
Message-ID: <94accdc1b6c6b86766117e8bf1720f79e33ad2aa.1710861023.git.zhengjunjie@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1710861023.git.zhengjunjie@HIDDEN>
References: <cover.1710861023.git.zhengjunjie@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-CM-TRANSID: zQCowAAnLLzZrPlljqBBBw--.46102S8
X-Coremail-Antispam: 1UD129KBjvJXoW7CFyUCFyfXw17Cw17tFyUGFg_yoW8Gw15p3
ZIk3WYkr1rGrZFg3WvgFn7Zr9IgwnYk34Uu3yxZw4xZwn8trykKr1Syr13CFWUZFWxCr1D
ZFW09ryUZr45Ar7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2
9KBjDU0xBIdaVrnRJUUU9Ib7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I2
0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI
8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28C
jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUCVW8JwA2z4x0Y4vE2Ix0cI
8IcVCY1x0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280
aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzV
Aqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S
6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s026x
CaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_
JrWlx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r
1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_
Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8Jb
IYCTnIWIevJa73UjIFyTuYvjxUgeHqDUUUU
X-Originating-IP: [183.247.5.22]
X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 69899
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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
guix-patches@HIDDEN:bug#69899; Package guix-patches.
Full text available.
Received: (at 69899) by debbugs.gnu.org; 19 Mar 2024 15:19:45 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 19 11:19:44 2024
Received: from localhost ([127.0.0.1]:51122 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rmbFg-0000i3-Ah
for submit <at> debbugs.gnu.org; Tue, 19 Mar 2024 11:19:44 -0400
Received: from smtp84.cstnet.cn ([159.226.251.84]:51172 helo=cstnet.cn)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zhengjunjie@HIDDEN>) id 1rmbFZ-0000gA-Hp
for 69899 <at> debbugs.gnu.org; Tue, 19 Mar 2024 11:19:42 -0400
Received: from m.taildaf0f.ts.net (unknown [183.247.5.22])
by APP-05 (Coremail) with SMTP id zQCowAAnLLzZrPlljqBBBw--.46102S3;
Tue, 19 Mar 2024 23:18:49 +0800 (CST)
From: Zheng Junjie <zhengjunjie@HIDDEN>
To: 69899 <at> debbugs.gnu.org
Subject: [PATCH 2/7] vm: use #$ for kernel-arguments.
Date: Tue, 19 Mar 2024 23:18:36 +0800
Message-ID: <384e20b4da664cd75a9e6f3be0b6fff8605033e7.1710861023.git.zhengjunjie@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1710861023.git.zhengjunjie@HIDDEN>
References: <cover.1710861023.git.zhengjunjie@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=y
Content-Transfer-Encoding: 8bit
X-CM-TRANSID: zQCowAAnLLzZrPlljqBBBw--.46102S3
X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73
VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUOn7k0a2IF6F4UM7kC6x804xWl14x267AK
xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw
A2048vs2IY020E87I2jVAFwI0_Jr4l82xGYIkIc2x26xkF7I0E14v26r18M28lY4IEw2II
xxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjc
xK6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0
Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wASzI0E04
IjxsIE14AKx2xKxwAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_JrI_
JrylYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwI
xGrwAKzVC20s0267AEwI8IwI0ExsIj0wCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkE
bVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r1j6r18MI8E67
AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI
42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMI
IF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvfC2
KfnxnUUI43ZEXa7IU8zc_3UUUUU==
X-Originating-IP: [183.247.5.22]
X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 69899
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Use #$ allow cross-compile to with support current system kernel.
e.g. linux-libre-riscv64-generic.
* gnu/system/vm.scm(system-qemu-image/shared-store-script)
(linux-image-startup-command): use #$ for kernel-arguments.
Change-Id: I9d2e7df296ce590b95cd30996b33f8ca692ac1b1
---
gnu/system/vm.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index fcfd1cdb48..40e965d272 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@HIDDEN>
;;; Copyright © 2017 Marius Bakke <mbakke@HIDDEN>
;;; Copyright © 2018 Chris Marusich <cmmarusich@HIDDEN>
+;;; Copyright © 2024 Zheng Junjie <873216071@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -270,7 +271,7 @@ (define* (system-qemu-image/shared-store-script os
(volatile-root? volatile?)))))
(define kernel-arguments
#~(list #$@(if graphic? #~() #~("console=ttyS0"))
- #+@(operating-system-kernel-arguments os "/dev/vda1")))
+ #$@(operating-system-kernel-arguments os "/dev/vda1")))
(define rw-image
#~(format #f "/tmp/guix-image-~a" (basename #$base-image)))
@@ -340,7 +341,7 @@ (define* (linux-image-startup-command image
(define kernel-arguments
#~(list #$@(if graphic? #~() #~("console=ttyS0"))
- #+@(operating-system-kernel-arguments os "/dev/vda1")))
+ #$@(operating-system-kernel-arguments os "/dev/vda1")))
#~`(#+(file-append qemu "/bin/"
(qemu-command (or target system)))
--
2.41.0
guix-patches@HIDDEN:bug#69899; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 19 Mar 2024 15:17:00 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 19 11:17:00 2024 Received: from localhost ([127.0.0.1]:51111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rmbD1-0000Sy-PG for submit <at> debbugs.gnu.org; Tue, 19 Mar 2024 11:17:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:39428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <zhengjunjie@HIDDEN>) id 1rmbD0-0000Sr-FO for submit <at> debbugs.gnu.org; Tue, 19 Mar 2024 11:16:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <zhengjunjie@HIDDEN>) id 1rmbCM-0002Xt-8J for guix-patches@HIDDEN; Tue, 19 Mar 2024 11:16:19 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from <zhengjunjie@HIDDEN>) id 1rmbCJ-0008RD-72 for guix-patches@HIDDEN; Tue, 19 Mar 2024 11:16:17 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.22]) by APP-05 (Coremail) with SMTP id zQCowABXydAtrPll5IpBBw--.45772S2; Tue, 19 Mar 2024 23:15:58 +0800 (CST) From: Zheng Junjie <zhengjunjie@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH 0/7] support to use `guix system vm' with riscv64. Date: Tue, 19 Mar 2024 23:15:53 +0800 Message-ID: <cover.1710861023.git.zhengjunjie@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABXydAtrPll5IpBBw--.45772S2 X-Coremail-Antispam: 1UD129KBjvdXoW7JFykJr17AF4xJw1UuFWxZwb_yoWkWwc_Ca s5WFyfJr47GFW7Ja4rJr1rJry8GrW7Cry7Wa17trW8Zr1xGw43Ja12yrsFv34jgFZ5Crnr ZF1kXryfZry2gjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbrAYjsxI4VW3JwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z2 80aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAK zVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx 8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s02 6xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_Jr I_JrWlx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v2 6r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj4 0_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8 JbIYCTnIWIevJa73UjIFyTuYvjxUc_-PUUUUU X-Originating-IP: [183.247.5.22] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.84; envelope-from=zhengjunjie@HIDDEN; helo=cstnet.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.4 (--) 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. Zheng Junjie (7): bootloader: Add u-boot-qemu-riscv64-bootloader. vm: use #$ for kernel-arguments. vm: When target riscv64-linux, use u-boot-qemu-riscv64-bootloader. gnu: linux-libre-riscv64-generic: add more options. linux-initrd: don't add hid-apple module for riscv64-linux. vm: add arguments to use virt machine type for qemu-riscv64. vm: If not the same local architecture, don't enable kvm. gnu/bootloader/u-boot.scm | 15 ++++++++++++++ gnu/packages/linux.scm | 19 +++++++++++++++++- gnu/system/linux-initrd.scm | 5 ++++- gnu/system/vm.scm | 40 ++++++++++++++++++++++++++----------- 4 files changed, 65 insertions(+), 14 deletions(-) base-commit: 83c5e7169d3bfa23a51225a8d809a435c1f2dd6b -- 2.41.0
Zheng Junjie <zhengjunjie@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#69899; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.