qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] nsis: Install *.elf images
@ 2021-03-26  6:21 Bin Meng
  2021-03-26 18:40 ` Philippe Mathieu-Daudé
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Bin Meng @ 2021-03-26  6:21 UTC (permalink / raw)
  To: Stefan Weil, Peter Maydell, qemu-devel

As of today, the QEMU Windows installer does not include the
following two RISC-V BIOS images:

- opensbi-riscv64-generic-fw_dynamic.elf
- opensbi-riscv32-generic-fw_dynamic.elf

Update the installer script to include them.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

---
Based on:
https://repo.or.cz/qemu/ar7.git/commit/657a6a90b69da971afdc71501c30275ba307ff6c

The above commit does not land on QEMU master. I am not sure what
the process is, sending it here for comments.

 qemu.nsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qemu.nsi b/qemu.nsi
index 96c5534254..aeabe3bdbe 100644
--- a/qemu.nsi
+++ b/qemu.nsi
@@ -142,6 +142,7 @@ Section "${PRODUCT}" QEMU_System_File_Section_Description
 
     File "${DATADIR}\*.bin"
     File "${DATADIR}\*.dtb"
+    File "${DATADIR}\*.elf"
     File "${DATADIR}\*.fd"
     File "${DATADIR}\*.img"
     File "${DATADIR}\*.lid"
@@ -258,6 +259,7 @@ Section "Uninstall" Uninstall_Section_Description
     Delete "$INSTDIR\*.bin"
     Delete "$INSTDIR\*.dll"
     Delete "$INSTDIR\*.dtb"
+    Delete "$INSTDIR\*.elf"
     Delete "$INSTDIR\*.fd"
     Delete "$INSTDIR\*.img"
     Delete "$INSTDIR\*.lid"
-- 
2.25.1



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] nsis: Install *.elf images
  2021-03-26  6:21 [PATCH] nsis: Install *.elf images Bin Meng
@ 2021-03-26 18:40 ` Philippe Mathieu-Daudé
  2021-03-30 16:15 ` Alistair Francis
  2021-04-06  9:04 ` Bin Meng
  2 siblings, 0 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-03-26 18:40 UTC (permalink / raw)
  To: Bin Meng, Stefan Weil, Peter Maydell, Paolo Bonzini; +Cc: qemu-devel

On 3/26/21 7:21 AM, Bin Meng wrote:
> As of today, the QEMU Windows installer does not include the
> following two RISC-V BIOS images:
> 
> - opensbi-riscv64-generic-fw_dynamic.elf
> - opensbi-riscv32-generic-fw_dynamic.elf
> 
> Update the installer script to include them.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

Following this series' idea:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg794466.html
"blobs: Only install required (system emulation) files"

Maybe we can use meson + cpp with C #ifdef'ry (including
config-host.h + meson definitions) to generate qemu.nsi
with only required blobs?

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
> Based on:
> https://repo.or.cz/qemu/ar7.git/commit/657a6a90b69da971afdc71501c30275ba307ff6c
> 
> The above commit does not land on QEMU master. I am not sure what
> the process is, sending it here for comments.
> 
>  qemu.nsi | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/qemu.nsi b/qemu.nsi
> index 96c5534254..aeabe3bdbe 100644
> --- a/qemu.nsi
> +++ b/qemu.nsi
> @@ -142,6 +142,7 @@ Section "${PRODUCT}" QEMU_System_File_Section_Description
>  
>      File "${DATADIR}\*.bin"
>      File "${DATADIR}\*.dtb"
> +    File "${DATADIR}\*.elf"
>      File "${DATADIR}\*.fd"
>      File "${DATADIR}\*.img"
>      File "${DATADIR}\*.lid"
> @@ -258,6 +259,7 @@ Section "Uninstall" Uninstall_Section_Description
>      Delete "$INSTDIR\*.bin"
>      Delete "$INSTDIR\*.dll"
>      Delete "$INSTDIR\*.dtb"
> +    Delete "$INSTDIR\*.elf"
>      Delete "$INSTDIR\*.fd"
>      Delete "$INSTDIR\*.img"
>      Delete "$INSTDIR\*.lid"
> 



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] nsis: Install *.elf images
  2021-03-26  6:21 [PATCH] nsis: Install *.elf images Bin Meng
  2021-03-26 18:40 ` Philippe Mathieu-Daudé
@ 2021-03-30 16:15 ` Alistair Francis
  2021-04-06  9:04 ` Bin Meng
  2 siblings, 0 replies; 7+ messages in thread
From: Alistair Francis @ 2021-03-30 16:15 UTC (permalink / raw)
  To: Bin Meng; +Cc: Stefan Weil, qemu-devel@nongnu.org Developers, Peter Maydell

On Fri, Mar 26, 2021 at 2:22 AM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> As of today, the QEMU Windows installer does not include the
> following two RISC-V BIOS images:
>
> - opensbi-riscv64-generic-fw_dynamic.elf
> - opensbi-riscv32-generic-fw_dynamic.elf
>
> Update the installer script to include them.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

>
> ---
> Based on:
> https://repo.or.cz/qemu/ar7.git/commit/657a6a90b69da971afdc71501c30275ba307ff6c
>
> The above commit does not land on QEMU master. I am not sure what
> the process is, sending it here for comments.
>
>  qemu.nsi | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/qemu.nsi b/qemu.nsi
> index 96c5534254..aeabe3bdbe 100644
> --- a/qemu.nsi
> +++ b/qemu.nsi
> @@ -142,6 +142,7 @@ Section "${PRODUCT}" QEMU_System_File_Section_Description
>
>      File "${DATADIR}\*.bin"
>      File "${DATADIR}\*.dtb"
> +    File "${DATADIR}\*.elf"
>      File "${DATADIR}\*.fd"
>      File "${DATADIR}\*.img"
>      File "${DATADIR}\*.lid"
> @@ -258,6 +259,7 @@ Section "Uninstall" Uninstall_Section_Description
>      Delete "$INSTDIR\*.bin"
>      Delete "$INSTDIR\*.dll"
>      Delete "$INSTDIR\*.dtb"
> +    Delete "$INSTDIR\*.elf"
>      Delete "$INSTDIR\*.fd"
>      Delete "$INSTDIR\*.img"
>      Delete "$INSTDIR\*.lid"
> --
> 2.25.1
>
>


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] nsis: Install *.elf images
  2021-03-26  6:21 [PATCH] nsis: Install *.elf images Bin Meng
  2021-03-26 18:40 ` Philippe Mathieu-Daudé
  2021-03-30 16:15 ` Alistair Francis
@ 2021-04-06  9:04 ` Bin Meng
  2021-04-06  9:28   ` Stefan Weil
  2 siblings, 1 reply; 7+ messages in thread
From: Bin Meng @ 2021-04-06  9:04 UTC (permalink / raw)
  To: Stefan Weil, Peter Maydell, qemu-devel@nongnu.org Developers

On Fri, Mar 26, 2021 at 2:22 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> As of today, the QEMU Windows installer does not include the
> following two RISC-V BIOS images:
>
> - opensbi-riscv64-generic-fw_dynamic.elf
> - opensbi-riscv32-generic-fw_dynamic.elf
>
> Update the installer script to include them.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>
> ---
> Based on:
> https://repo.or.cz/qemu/ar7.git/commit/657a6a90b69da971afdc71501c30275ba307ff6c
>
> The above commit does not land on QEMU master. I am not sure what
> the process is, sending it here for comments.
>
>  qemu.nsi | 2 ++
>  1 file changed, 2 insertions(+)

Ping?


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] nsis: Install *.elf images
  2021-04-06  9:04 ` Bin Meng
@ 2021-04-06  9:28   ` Stefan Weil
  2021-04-07 12:06     ` Laurent Vivier
  0 siblings, 1 reply; 7+ messages in thread
From: Stefan Weil @ 2021-04-06  9:28 UTC (permalink / raw)
  To: Bin Meng, Peter Maydell, qemu-devel@nongnu.org Developers,
	QEMU Trivial, Philippe Mathieu-Daudé,
	Alistair Francis

Am 06.04.21 um 11:04 schrieb Bin Meng:

> On Fri, Mar 26, 2021 at 2:22 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>> As of today, the QEMU Windows installer does not include the
>> following two RISC-V BIOS images:
>>
>> - opensbi-riscv64-generic-fw_dynamic.elf
>> - opensbi-riscv32-generic-fw_dynamic.elf
>>
>> Update the installer script to include them.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>>
>> ---
>> Based on:
>> https://repo.or.cz/qemu/ar7.git/commit/657a6a90b69da971afdc71501c30275ba307ff6c
>>
>> The above commit does not land on QEMU master. I am not sure what
>> the process is, sending it here for comments.
>>
>>   qemu.nsi | 2 ++
>>   1 file changed, 2 insertions(+)
> Ping?


Reviewed-by: Stefan Weil <sw@weilnetz.de>

This is a small uncritical fix which can be merged via QEMU trivial.

As Philippe already mentioned, a more advanced solution would only 
install the required binaries, but typically the NSIS installer is built 
with all system emulations, so it requires all available blobs. 
Thererfore the current solution is fine for now.

Regards,

Stefan





^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] nsis: Install *.elf images
  2021-04-06  9:28   ` Stefan Weil
@ 2021-04-07 12:06     ` Laurent Vivier
  2021-04-07 12:13       ` Bin Meng
  0 siblings, 1 reply; 7+ messages in thread
From: Laurent Vivier @ 2021-04-07 12:06 UTC (permalink / raw)
  To: Stefan Weil, Bin Meng, Peter Maydell,
	qemu-devel@nongnu.org Developers, QEMU Trivial,
	Philippe Mathieu-Daudé,
	Alistair Francis

Le 06/04/2021 à 11:28, Stefan Weil a écrit :
> Am 06.04.21 um 11:04 schrieb Bin Meng:
> 
>> On Fri, Mar 26, 2021 at 2:22 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>>> As of today, the QEMU Windows installer does not include the
>>> following two RISC-V BIOS images:
>>>
>>> - opensbi-riscv64-generic-fw_dynamic.elf
>>> - opensbi-riscv32-generic-fw_dynamic.elf
>>>
>>> Update the installer script to include them.
>>>
>>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>>>
>>> ---
>>> Based on:
>>> https://repo.or.cz/qemu/ar7.git/commit/657a6a90b69da971afdc71501c30275ba307ff6c
>>>
>>> The above commit does not land on QEMU master. I am not sure what
>>> the process is, sending it here for comments.
>>>
>>>   qemu.nsi | 2 ++
>>>   1 file changed, 2 insertions(+)
>> Ping?
> 
> 
> Reviewed-by: Stefan Weil <sw@weilnetz.de>
> 
> This is a small uncritical fix which can be merged via QEMU trivial.

If it is merged via QEMU trivial, it will be after the 6.0 release.
If it's needed for 6.0 it's better to go via the maintainer tree (W32,W64) [1]

Thanks,
Laurent

[1] the reason is: even a trivial change can break something, I don't like to break QEMU during RC
phase, so going via the maintainer tree helps to have tests more relevant to the area that is modified.


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] nsis: Install *.elf images
  2021-04-07 12:06     ` Laurent Vivier
@ 2021-04-07 12:13       ` Bin Meng
  0 siblings, 0 replies; 7+ messages in thread
From: Bin Meng @ 2021-04-07 12:13 UTC (permalink / raw)
  To: Laurent Vivier
  Cc: Peter Maydell, QEMU Trivial, Stefan Weil,
	Philippe Mathieu-Daudé,
	qemu-devel@nongnu.org Developers, Alistair Francis

Hi Stefan,

On Wed, Apr 7, 2021 at 8:06 PM Laurent Vivier <laurent@vivier.eu> wrote:
>
> Le 06/04/2021 à 11:28, Stefan Weil a écrit :
> > Am 06.04.21 um 11:04 schrieb Bin Meng:
> >
> >> On Fri, Mar 26, 2021 at 2:22 PM Bin Meng <bmeng.cn@gmail.com> wrote:
> >>> As of today, the QEMU Windows installer does not include the
> >>> following two RISC-V BIOS images:
> >>>
> >>> - opensbi-riscv64-generic-fw_dynamic.elf
> >>> - opensbi-riscv32-generic-fw_dynamic.elf
> >>>
> >>> Update the installer script to include them.
> >>>
> >>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> >>>
> >>> ---
> >>> Based on:
> >>> https://repo.or.cz/qemu/ar7.git/commit/657a6a90b69da971afdc71501c30275ba307ff6c
> >>>
> >>> The above commit does not land on QEMU master. I am not sure what
> >>> the process is, sending it here for comments.
> >>>
> >>>   qemu.nsi | 2 ++
> >>>   1 file changed, 2 insertions(+)
> >> Ping?
> >
> >
> > Reviewed-by: Stefan Weil <sw@weilnetz.de>
> >
> > This is a small uncritical fix which can be merged via QEMU trivial.
>
> If it is merged via QEMU trivial, it will be after the 6.0 release.
> If it's needed for 6.0 it's better to go via the maintainer tree (W32,W64) [1]

I think this should go in 6.0.

But as I mentioned that the patch is based on
https://repo.or.cz/qemu/ar7.git/commit/657a6a90b69da971afdc71501c30275ba307ff6c

which is not in the QEMU mainline yet.

Is QEMU Windows installer fork (https://repo.or.cz/qemu/ar7.git/) not
supposed to merge back to QEMU mainline?

Regards,
Bin


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2021-04-07 12:15 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-26  6:21 [PATCH] nsis: Install *.elf images Bin Meng
2021-03-26 18:40 ` Philippe Mathieu-Daudé
2021-03-30 16:15 ` Alistair Francis
2021-04-06  9:04 ` Bin Meng
2021-04-06  9:28   ` Stefan Weil
2021-04-07 12:06     ` Laurent Vivier
2021-04-07 12:13       ` Bin Meng

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).