* [PATCH v3] configure: Only build s390-ccw BIOS when system emulation is built
@ 2021-01-25 16:58 Philippe Mathieu-Daudé
2021-01-26 18:32 ` Thomas Huth
0 siblings, 1 reply; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-25 16:58 UTC (permalink / raw)
To: qemu-devel
Cc: Thomas Huth, Cornelia Huck, Laurent Vivier,
Philippe Mathieu-Daudé, Christian Borntraeger, qemu-s390x
It is pointless to build the s390-ccw BIOS when only user-mode
emulation is built. Only build it when s390 system mode emulation
is selected.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
v3: Restrict to s390x host (thuth)
v2: Restrict to s390x-softmmu target (thuth)
---
configure | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index dcc5ea7d630..4751d3e352d 100755
--- a/configure
+++ b/configure
@@ -5372,8 +5372,14 @@ if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \
done
fi
+s390_ccw_bios=no
+# Only build s390-ccw bios if we're targetting s390x system emulation
+case $target_list in
+ *"s390x-softmmu"*) s390_ccw_bios=yes
+ ;;
+esac
# Only build s390-ccw bios if we're on s390x and the compiler has -march=z900
-if test "$cpu" = "s390x" ; then
+if test "$cpu" = "s390x" && test "$s390_ccw_bios" = yes; then
write_c_skeleton
if compile_prog "-march=z900" ""; then
roms="$roms s390-ccw"
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH v3] configure: Only build s390-ccw BIOS when system emulation is built
2021-01-25 16:58 [PATCH v3] configure: Only build s390-ccw BIOS when system emulation is built Philippe Mathieu-Daudé
@ 2021-01-26 18:32 ` Thomas Huth
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Huth @ 2021-01-26 18:32 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Christian Borntraeger, qemu-s390x, Cornelia Huck, Laurent Vivier
On 25/01/2021 17.58, Philippe Mathieu-Daudé wrote:
> It is pointless to build the s390-ccw BIOS when only user-mode
> emulation is built. Only build it when s390 system mode emulation
> is selected.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> v3: Restrict to s390x host (thuth)
> v2: Restrict to s390x-softmmu target (thuth)
> ---
> configure | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index dcc5ea7d630..4751d3e352d 100755
> --- a/configure
> +++ b/configure
> @@ -5372,8 +5372,14 @@ if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \
> done
> fi
>
> +s390_ccw_bios=no
> +# Only build s390-ccw bios if we're targetting s390x system emulation
> +case $target_list in
> + *"s390x-softmmu"*) s390_ccw_bios=yes
> + ;;
> +esac
> # Only build s390-ccw bios if we're on s390x and the compiler has -march=z900
> -if test "$cpu" = "s390x" ; then
> +if test "$cpu" = "s390x" && test "$s390_ccw_bios" = yes; then
Looks good to me now ... but maybe it could even be done simpler (without
the case statement) by simply doing:
if test "$cpu" = "s390x" && echo "$target_list" | grep -q s390x-softmmu ; then
...
?
Thomas
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-26 18:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-25 16:58 [PATCH v3] configure: Only build s390-ccw BIOS when system emulation is built Philippe Mathieu-Daudé
2021-01-26 18:32 ` Thomas Huth
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).