mbox

[PULL,0/3] Firmware/seabios 20230912 patches

Message ID 20230912105359.563101-1-kraxel@redhat.com
State New
Headers show

Pull-request

https://gitlab.com/kraxel/qemu.git tags/firmware/seabios-20230912-pull-request

Message

Gerd Hoffmann Sept. 12, 2023, 10:53 a.m. UTC
The following changes since commit c5ea91da443b458352c1b629b490ee6631775cb4:

  Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging (2023-09-08 10:06:25 -0400)

are available in the Git repository at:

  https://gitlab.com/kraxel/qemu.git tags/firmware/seabios-20230912-pull-request

for you to fetch changes up to a14c30fc3d38d569415259a2d877c36a0b8de058:

  seabios: update binaries to git snapshot (2023-09-11 17:32:44 +0200)

----------------------------------------------------------------
seabios: update to git snapshot

Give seabios updates some testing coverage before
tagging a new release.  Update to release code
will follow later in the 8.2 devel cycle.

----------------------------------------------------------------

Gerd Hoffmann (3):
  seabios: update submodule to git snapshot
  seabios: turn off CONFIG_APMBIOS for 128k build
  seabios: update binaries to git snapshot

 pc-bios/bios-256k.bin             | Bin 262144 -> 262144 bytes
 pc-bios/bios-microvm.bin          | Bin 131072 -> 131072 bytes
 pc-bios/bios.bin                  | Bin 131072 -> 131072 bytes
 pc-bios/vgabios-ati.bin           | Bin 39936 -> 39424 bytes
 pc-bios/vgabios-bochs-display.bin | Bin 28672 -> 28672 bytes
 pc-bios/vgabios-cirrus.bin        | Bin 39424 -> 38912 bytes
 pc-bios/vgabios-qxl.bin           | Bin 39936 -> 39424 bytes
 pc-bios/vgabios-ramfb.bin         | Bin 29184 -> 28672 bytes
 pc-bios/vgabios-stdvga.bin        | Bin 39936 -> 39424 bytes
 pc-bios/vgabios-virtio.bin        | Bin 39936 -> 39424 bytes
 pc-bios/vgabios-vmware.bin        | Bin 39936 -> 39424 bytes
 pc-bios/vgabios.bin               | Bin 39424 -> 38912 bytes
 roms/config.seabios-128k          |   1 +
 roms/seabios                      |   2 +-
 14 files changed, 2 insertions(+), 1 deletion(-)

Comments

Stefan Hajnoczi Sept. 12, 2023, 12:56 p.m. UTC | #1
On Tue, 12 Sept 2023 at 06:55, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit c5ea91da443b458352c1b629b490ee6631775cb4:
>
>   Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging (2023-09-08 10:06:25 -0400)
>
> are available in the Git repository at:
>
>   https://gitlab.com/kraxel/qemu.git tags/firmware/seabios-20230912-pull-request
>
> for you to fetch changes up to a14c30fc3d38d569415259a2d877c36a0b8de058:
>
>   seabios: update binaries to git snapshot (2023-09-11 17:32:44 +0200)
>
> ----------------------------------------------------------------
> seabios: update to git snapshot
>
> Give seabios updates some testing coverage before
> tagging a new release.  Update to release code
> will follow later in the 8.2 devel cycle.
>
> ----------------------------------------------------------------
>
> Gerd Hoffmann (3):
>   seabios: update submodule to git snapshot
>   seabios: turn off CONFIG_APMBIOS for 128k build
>   seabios: update binaries to git snapshot
>
>  pc-bios/bios-256k.bin             | Bin 262144 -> 262144 bytes
>  pc-bios/bios-microvm.bin          | Bin 131072 -> 131072 bytes
>  pc-bios/bios.bin                  | Bin 131072 -> 131072 bytes
>  pc-bios/vgabios-ati.bin           | Bin 39936 -> 39424 bytes
>  pc-bios/vgabios-bochs-display.bin | Bin 28672 -> 28672 bytes
>  pc-bios/vgabios-cirrus.bin        | Bin 39424 -> 38912 bytes
>  pc-bios/vgabios-qxl.bin           | Bin 39936 -> 39424 bytes
>  pc-bios/vgabios-ramfb.bin         | Bin 29184 -> 28672 bytes
>  pc-bios/vgabios-stdvga.bin        | Bin 39936 -> 39424 bytes
>  pc-bios/vgabios-virtio.bin        | Bin 39936 -> 39424 bytes
>  pc-bios/vgabios-vmware.bin        | Bin 39936 -> 39424 bytes
>  pc-bios/vgabios.bin               | Bin 39424 -> 38912 bytes
>  roms/config.seabios-128k          |   1 +
>  roms/seabios                      |   2 +-
>  14 files changed, 2 insertions(+), 1 deletion(-)

Hi Gerd,
I think either this pull request or your edk2 pull request causes the
following CI failure:

>>> G_TEST_DBUS_DAEMON=/builds/qemu-project/qemu/tests/dbus-vmstate-daemon.sh QTEST_QEMU_BINARY=./qemu-system-aarch64 MALLOC_PERTURB_=199 /builds/qemu-project/qemu/build/tests/qtest/bios-tables-test --tap -k
――――――――――――――――――――――――――――――――――――― ✀ ―――――――――――――――――――――――――――――――――――――
stderr:
acpi-test: Warning! SSDT binary file mismatch. Actual
[aml:/tmp/aml-IO0CB2], Expected [aml:tests/data/acpi/virt/SSDT.memhp].
See source file tests/qtest/bios-tables-test.c for instructions on how
to update expected files.
to see ASL diff between mismatched files install IASL, rebuild QEMU
from scratch and re-run tests with V=1 environment variable set**
ERROR:../tests/qtest/bios-tables-test.c:535:test_acpi_asl: assertion
failed: (all_tables_match)
(test program exited with status code -6)

https://gitlab.com/qemu-project/qemu/-/jobs/5067995448

I have dropped this pull request for now. Please take a look.

Stefan
Gerd Hoffmann Sept. 18, 2023, 9:59 a.m. UTC | #2
> Hi Gerd,
> I think either this pull request or your edk2 pull request causes the
> following CI failure:
> 
> >>> G_TEST_DBUS_DAEMON=/builds/qemu-project/qemu/tests/dbus-vmstate-daemon.sh QTEST_QEMU_BINARY=./qemu-system-aarch64 MALLOC_PERTURB_=199 /builds/qemu-project/qemu/build/tests/qtest/bios-tables-test --tap -k
> ――――――――――――――――――――――――――――――――――――― ✀ ―――――――――――――――――――――――――――――――――――――

Address change in ACPI tables (edk2 PR):

     DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001)
     {
         Scope (\_SB)
         {
             Device (NVDR)
             {
                 Name (_HID, "ACPI0012" /* NVDIMM Root Device */)  // _HID: Hardware ID
		 [ ... ]
             }
         }
    
    -    Name (MEMA, 0x43D10000)
    +    Name (MEMA, 0x43C90000)
     }

seabios PR is fine and passes "make check".

take care,
  Gerd
Stefan Hajnoczi Sept. 18, 2023, 12:52 p.m. UTC | #3
On Mon, 18 Sept 2023 at 06:00, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> > Hi Gerd,
> > I think either this pull request or your edk2 pull request causes the
> > following CI failure:
> >
> > >>> G_TEST_DBUS_DAEMON=/builds/qemu-project/qemu/tests/dbus-vmstate-daemon.sh QTEST_QEMU_BINARY=./qemu-system-aarch64 MALLOC_PERTURB_=199 /builds/qemu-project/qemu/build/tests/qtest/bios-tables-test --tap -k
> > ――――――――――――――――――――――――――――――――――――― ✀ ―――――――――――――――――――――――――――――――――――――
>
> Address change in ACPI tables (edk2 PR):
>
>      DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001)
>      {
>          Scope (\_SB)
>          {
>              Device (NVDR)
>              {
>                  Name (_HID, "ACPI0012" /* NVDIMM Root Device */)  // _HID: Hardware ID
>                  [ ... ]
>              }
>          }
>
>     -    Name (MEMA, 0x43D10000)
>     +    Name (MEMA, 0x43C90000)
>      }
>
> seabios PR is fine and passes "make check".

I'm still seeing a CI failure:

3/61 qemu:qtest+qtest-x86_64 / qtest-x86_64/bios-tables-test ERROR
19.18s killed by signal 6 SIGABRT
――――――――――――――――――――――――――――――――――――― ✀ ―――――――――――――――――――――――――――――――――――――
stderr:
acpi-test: Warning! DSDT binary file mismatch. Actual
[aml:/var/folders/76/zy5ktkns50v6gt5g8r0sf6sc0000gn/T/aml-SW7IB2],
Expected [aml:tests/data/acpi/q35/DSDT.mmio64].
See source file tests/qtest/bios-tables-test.c for instructions on how
to update expected files.
to see ASL diff between mismatched files install IASL, rebuild QEMU
from scratch and re-run tests with V=1 environment variable set**
ERROR:../tests/qtest/bios-tables-test.c:535:test_acpi_asl: assertion
failed: (all_tables_match)
(test program exited with status code -6)

https://gitlab.com/qemu-project/qemu/-/jobs/5110608123

>
> take care,
>   Gerd
>
Daniel P. Berrangé Sept. 18, 2023, 1:05 p.m. UTC | #4
On Mon, Sep 18, 2023 at 08:52:57AM -0400, Stefan Hajnoczi wrote:
> On Mon, 18 Sept 2023 at 06:00, Gerd Hoffmann <kraxel@redhat.com> wrote:
> >
> > > Hi Gerd,
> > > I think either this pull request or your edk2 pull request causes the
> > > following CI failure:
> > >
> > > >>> G_TEST_DBUS_DAEMON=/builds/qemu-project/qemu/tests/dbus-vmstate-daemon.sh QTEST_QEMU_BINARY=./qemu-system-aarch64 MALLOC_PERTURB_=199 /builds/qemu-project/qemu/build/tests/qtest/bios-tables-test --tap -k
> > > ――――――――――――――――――――――――――――――――――――― ✀ ―――――――――――――――――――――――――――――――――――――
> >
> > Address change in ACPI tables (edk2 PR):
> >
> >      DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001)
> >      {
> >          Scope (\_SB)
> >          {
> >              Device (NVDR)
> >              {
> >                  Name (_HID, "ACPI0012" /* NVDIMM Root Device */)  // _HID: Hardware ID
> >                  [ ... ]
> >              }
> >          }
> >
> >     -    Name (MEMA, 0x43D10000)
> >     +    Name (MEMA, 0x43C90000)
> >      }
> >
> > seabios PR is fine and passes "make check".
> 
> I'm still seeing a CI failure:
> 
> 3/61 qemu:qtest+qtest-x86_64 / qtest-x86_64/bios-tables-test ERROR
> 19.18s killed by signal 6 SIGABRT
> ――――――――――――――――――――――――――――――――――――― ✀ ―――――――――――――――――――――――――――――――――――――
> stderr:
> acpi-test: Warning! DSDT binary file mismatch. Actual
> [aml:/var/folders/76/zy5ktkns50v6gt5g8r0sf6sc0000gn/T/aml-SW7IB2],
> Expected [aml:tests/data/acpi/q35/DSDT.mmio64].
> See source file tests/qtest/bios-tables-test.c for instructions on how
> to update expected files.
> to see ASL diff between mismatched files install IASL, rebuild QEMU
> from scratch and re-run tests with V=1 environment variable set**
> ERROR:../tests/qtest/bios-tables-test.c:535:test_acpi_asl: assertion
> failed: (all_tables_match)

Hmm, that's rather unhelpful - we need to get iasl added to the build
env by default.

> (test program exited with status code -6)
> 
> https://gitlab.com/qemu-project/qemu/-/jobs/5110608123

Note this is a aarch64 macOS environment

With regards,
Daniel
Gerd Hoffmann Sept. 18, 2023, 1:40 p.m. UTC | #5
Hi,

> > I'm still seeing a CI failure:
> > 
> > 3/61 qemu:qtest+qtest-x86_64 / qtest-x86_64/bios-tables-test ERROR
> > 19.18s killed by signal 6 SIGABRT
           ^^^^^^^^^^^^^^^^^^^^^^^^^^

> Hmm, that's rather unhelpful - we need to get iasl added to the build
> env by default.

That is a good idea in general but unlikely to help in this specific case.

> > https://gitlab.com/qemu-project/qemu/-/jobs/5110608123
> 
> Note this is a aarch64 macOS environment

Which explains why I don't see this on my x86 fedora workstation ...

take care,
  Gerd