qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: Jared Rossi <jrossi@linux.ibm.com>,
	qemu-devel@nongnu.org, qemu-s390x@nongnu.org
Cc: frankja@linux.ibm.com
Subject: Re: [PATCH v5 02/19] pc-bios/s390-ccw: Use the libc from SLOF and remove sclp prints
Date: Wed, 23 Oct 2024 06:51:03 +0200	[thread overview]
Message-ID: <a189b1fa-4cac-46e5-9253-e2bb2143c3c1@redhat.com> (raw)
In-Reply-To: <39ac6705-8787-4a00-a825-934d4897fdf4@linux.ibm.com>

On 22/10/2024 22.12, Jared Rossi wrote:
> 
> 
> On 10/22/24 1:36 PM, Thomas Huth wrote:
>> On 20/10/2024 03.29, jrossi@linux.ibm.com wrote:
>>> From: Jared Rossi <jrossi@linux.ibm.com>
>>>
>>> We are already using the libc from SLOF for the s390-netboot.img, and
>>> this libc implementation is way more complete and accurate than the
>>> simple implementation that we currently use for the s390-ccw.img binary.
>>> Since we are now always assuming that the SLOF submodule is available
>>> when building the s390-ccw bios (see commit bf6903f6944f), we can drop
>>> the simple implementation and use the SLOF libc for the s390-ccw.img
>>> binary, too.
>>>
>>> Additionally replace sclp_print calls with puts/printf now that it is 
>>> avaliable.
>>>
>>> Co-authored by: Thomas Huth <thuth@redhat.com>
>>> Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
>>> ---
>>>   pc-bios/s390-ccw/netboot.mak     |  3 --
>>>   pc-bios/s390-ccw/bootmap.h       |  4 +-
>>>   pc-bios/s390-ccw/libc.h          | 89 --------------------------------
>>
>> I just had to discover that the removal of the old libc breaks "make 
>> check-tcg" since it uses the sclp.c from the firmware for printing.
>>
>> I'll squash this patch to fix it:
>>
>> diff --git a/tests/tcg/s390x/console.c b/tests/tcg/s390x/console.c
>> --- a/tests/tcg/s390x/console.c
>> +++ b/tests/tcg/s390x/console.c
>> @@ -4,7 +4,10 @@
>>   *
>>   * SPDX-License-Identifier: GPL-2.0-or-later
>>   */
>> +
>>  #include "../../../pc-bios/s390-ccw/sclp.c"
>> +#include "../../../roms/SLOF/lib/libc/string/memset.c"
>> +#include "../../../roms/SLOF/lib/libc/string/memcpy.c"
>>
>>  void __sys_outc(char c)
>>  {
>> diff --git a/tests/tcg/s390x/Makefile.softmmu-target b/tests/tcg/s390x/ 
>> Makefile.softmmu-target
>> --- a/tests/tcg/s390x/Makefile.softmmu-target
>> +++ b/tests/tcg/s390x/Makefile.softmmu-target
>> @@ -3,7 +3,9 @@ VPATH+=$(S390X_SRC)
>>  # EXTFLAGS can be passed by the user, e.g. to override the --accel
>>  QEMU_OPTS+=-action panic=exit-failure -nographic -serial chardev:output 
>> $(EXTFLAGS) -kernel
>>  LINK_SCRIPT=$(S390X_SRC)/softmmu.ld
>> -CFLAGS+=-ggdb -O0
>> +CFLAGS+=-ggdb -O0 \
>> +    -I$(SRC_PATH)/roms/SLOF/lib/libc/include/ \
> 
> I'm not sure if it is just a problem with my setup, but with this patch 
> applied I hit an error when running "make check-tcg --always-make"
> 
>          In file included from /root/staging/qemu/tests/tcg/multiarch/ 
> system/memory.c:17:
>          /usr/include/inttypes.h:351:8: error: unknown type name ‘intmax_t’
>            351 | extern intmax_t imaxabs (intmax_t __n) __THROW 
> __attribute__ ((__const__));
> 
> It seems to be cause by including the SLOF libc, because it works for me 
> without that.
> 
> For what it's worth, it worked until used I "--always-make", so if you 
> aren't building all targets some change might not be picked up here.

I don't see it locally, but I've hit the same problem in the CI:

  https://gitlab.com/thuth/qemu/-/jobs/8156508094#L6090

It seems to work for me, if I simply drop that 
"-I$(SRC_PATH)/roms/SLOF/lib/libc/include/" line again and only use the 
other -I line. I initially struggled a little bit with my cross-compiler 
setup, that's why I thought I'd need the line, but I think it is not 
required with a proper setup.
Could you please check whether it works for you if you remove that line?

  Thanks,
    Thomas



  reply	other threads:[~2024-10-23  4:52 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-20  1:29 [PATCH v5 00/19] s390x: Add Full Boot Order Support jrossi
2024-10-20  1:29 ` [PATCH v5 01/19] hw/s390x/ipl: Provide more memory to the s390-ccw.img firmware jrossi
2024-10-20  1:29 ` [PATCH v5 02/19] pc-bios/s390-ccw: Use the libc from SLOF and remove sclp prints jrossi
2024-10-22 17:36   ` Thomas Huth
2024-10-22 20:12     ` Jared Rossi
2024-10-23  4:51       ` Thomas Huth [this message]
2024-10-23 10:30         ` Jared Rossi
2024-10-20  1:29 ` [PATCH v5 03/19] pc-bios/s390-ccw: Link the netboot code into the main s390-ccw.img binary jrossi
2024-10-20  1:29 ` [PATCH v5 04/19] hw/s390x: Remove the possibility to load the s390-netboot.img binary jrossi
2024-10-20  1:29 ` [PATCH v5 05/19] pc-bios/s390-ccw: Merge netboot.mak into the main Makefile jrossi
2024-10-20  1:29 ` [PATCH v5 06/19] docs/system/s390x/bootdevices: Update the documentation about network booting jrossi
2024-10-20  1:29 ` [PATCH v5 07/19] pc-bios/s390-ccw: Remove panics from ISO IPL path jrossi
2024-10-21  8:41   ` Thomas Huth
2024-10-20  1:29 ` [PATCH v5 08/19] pc-bios/s390-ccw: Remove panics from ECKD " jrossi
2024-10-21  9:12   ` Thomas Huth
2024-10-20  1:29 ` [PATCH v5 09/19] pc-bios/s390-ccw: Remove panics from SCSI " jrossi
2024-10-21  9:26   ` Thomas Huth
2024-10-20  1:29 ` [PATCH v5 10/19] pc-bios/s390-ccw: Remove panics from DASD " jrossi
2024-10-20  1:29 ` [PATCH v5 11/19] pc-bios/s390-ccw: Remove panics from Netboot " jrossi
2024-10-21  9:30   ` Thomas Huth
2024-10-20  1:29 ` [PATCH v5 12/19] pc-bios/s390-ccw: Enable failed IPL to return after error jrossi
2024-10-20  1:29 ` [PATCH v5 13/19] include/hw/s390x: Add include files for common IPL structs jrossi
2024-10-20  1:29 ` [PATCH v5 14/19] s390x: Add individual loadparm assignment to CCW device jrossi
2024-10-21 12:26   ` Thomas Huth
2024-10-31  8:45   ` Thomas Huth
2024-11-05 20:22     ` Jared Rossi
2024-10-20  1:29 ` [PATCH v5 15/19] hw/s390x: Build an IPLB for each boot device jrossi
2024-10-21 12:43   ` Thomas Huth
2024-10-22 13:13   ` Thomas Huth
2024-10-22 14:25     ` Jared Rossi
2024-10-20  1:29 ` [PATCH v5 16/19] s390x: Rebuild IPLB for SCSI device directly from DIAG308 jrossi
2024-10-20  1:29 ` [PATCH v5 17/19] pc-bios/s390x: Enable multi-device boot loop jrossi
2024-10-22  7:33   ` Thomas Huth
2024-10-20  1:29 ` [PATCH v5 18/19] docs/system: Update documentation for s390x IPL jrossi
2024-10-20  1:29 ` [PATCH v5 19/19] tests/qtest: Add s390x boot order tests to cdrom-test.c jrossi
2024-10-21 14:52   ` Thomas Huth
2024-10-31 15:50 ` [PATCH v5 00/19] s390x: Add Full Boot Order Support Thomas Huth
2024-11-05 16:42   ` Jared Rossi
2024-11-06 11:10     ` Thomas Huth
2024-11-07 20:42       ` Jared Rossi
2024-11-08 14:37         ` Thomas Huth
2024-11-11 12:23           ` Thomas Huth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a189b1fa-4cac-46e5-9253-e2bb2143c3c1@redhat.com \
    --to=thuth@redhat.com \
    --cc=frankja@linux.ibm.com \
    --cc=jrossi@linux.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).