tests/data/acpi: Update SPCR golden-ref for RISC-V virt

[PATCH v1] tests/data/acpi: Update SPCR golden-ref for RISC-V virt

Posted by Chao Liu 1 month, 2 weeks ago

Update the expected SPCR binary to match the corrected field
sequence after the Terminal Type and Language fields were swapped
back to their proper order.

This fixes the qtest-riscv64/bios-tables-test CI failure:
  https://gitlab.com/TaoTang/qemu/-/jobs/13879552268

Fixes: 977c6fefcd04 ("hw/acpi: correct field sequence in SPCR table")
Signed-off-by: Chao Liu <chao.liu.zevorn@gmail.com>
Tested-by: Tao Tang <tangtao1634@phytium.com.cn>
---
 tests/data/acpi/riscv64/virt/SPCR | Bin 90 -> 90 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/data/acpi/riscv64/virt/SPCR b/tests/data/acpi/riscv64/virt/SPCR
index 09617f8793a6f7b1f08172f735b58aa748671540..59d2c8f7f215a604612cbd0294c18bc6301e208a 100644
GIT binary patch
delta 10
Rcma!wnqbGo%rMbG3IGpM0&@TW

delta 10
Rcma!wnqbGoz&z1G3IGpJ0&@TW

-- 
2.53.0

Re: [PATCH v1] tests/data/acpi: Update SPCR golden-ref for RISC-V virt

Posted by Alistair Francis 1 month, 2 weeks ago

On Sun, Apr 12, 2026 at 11:25 AM Chao Liu <chao.liu.zevorn@gmail.com> wrote:
>
> Update the expected SPCR binary to match the corrected field
> sequence after the Terminal Type and Language fields were swapped
> back to their proper order.
>
> This fixes the qtest-riscv64/bios-tables-test CI failure:
>   https://gitlab.com/TaoTang/qemu/-/jobs/13879552268
>
> Fixes: 977c6fefcd04 ("hw/acpi: correct field sequence in SPCR table")
> Signed-off-by: Chao Liu <chao.liu.zevorn@gmail.com>
> Tested-by: Tao Tang <tangtao1634@phytium.com.cn>

Thanks for the fix!

Do you guys (Heinrich and Chao) mind if I squash this with "hw/acpi:
correct field sequence in SPCR table"? They are both in my tree and if
I can squash them then it keeps the tree bisectable

Alistair

> ---
>  tests/data/acpi/riscv64/virt/SPCR | Bin 90 -> 90 bytes
>  1 file changed, 0 insertions(+), 0 deletions(-)
>
> diff --git a/tests/data/acpi/riscv64/virt/SPCR b/tests/data/acpi/riscv64/virt/SPCR
> index 09617f8793a6f7b1f08172f735b58aa748671540..59d2c8f7f215a604612cbd0294c18bc6301e208a 100644
> GIT binary patch
> delta 10
> Rcma!wnqbGo%rMbG3IGpM0&@TW
>
> delta 10
> Rcma!wnqbGoz&z1G3IGpJ0&@TW
>
> --
> 2.53.0
>
>

Re: [PATCH v1] tests/data/acpi: Update SPCR golden-ref for RISC-V virt

Posted by Chao Liu 1 month, 1 week ago

On Thu, Apr 16, 2026 at 12:35:59PM +1000, Alistair Francis wrote:
> On Sun, Apr 12, 2026 at 11:25 AM Chao Liu <chao.liu.zevorn@gmail.com> wrote:
> >
> > Update the expected SPCR binary to match the corrected field
> > sequence after the Terminal Type and Language fields were swapped
> > back to their proper order.
> >
> > This fixes the qtest-riscv64/bios-tables-test CI failure:
> >   https://gitlab.com/TaoTang/qemu/-/jobs/13879552268
> >
> > Fixes: 977c6fefcd04 ("hw/acpi: correct field sequence in SPCR table")
> > Signed-off-by: Chao Liu <chao.liu.zevorn@gmail.com>
> > Tested-by: Tao Tang <tangtao1634@phytium.com.cn>
> 
> Thanks for the fix!
> 
> Do you guys (Heinrich and Chao) mind if I squash this with "hw/acpi:
> correct field sequence in SPCR table"? They are both in my tree and if
> I can squash them then it keeps the tree bisectable
> 
Sounds good to me.

Thanks,
Chao

> Alistair
> 
> > ---
> >  tests/data/acpi/riscv64/virt/SPCR | Bin 90 -> 90 bytes
> >  1 file changed, 0 insertions(+), 0 deletions(-)
> >
> > diff --git a/tests/data/acpi/riscv64/virt/SPCR b/tests/data/acpi/riscv64/virt/SPCR
> > index 09617f8793a6f7b1f08172f735b58aa748671540..59d2c8f7f215a604612cbd0294c18bc6301e208a 100644
> > GIT binary patch
> > delta 10
> > Rcma!wnqbGo%rMbG3IGpM0&@TW
> >
> > delta 10
> > Rcma!wnqbGoz&z1G3IGpJ0&@TW
> >
> > --
> > 2.53.0
> >
> >

Re: [PATCH v1] tests/data/acpi: Update SPCR golden-ref for RISC-V virt

Posted by Heinrich Schuchardt 1 month, 2 weeks ago

On 4/16/26 04:35, Alistair Francis wrote:
> On Sun, Apr 12, 2026 at 11:25 AM Chao Liu <chao.liu.zevorn@gmail.com> wrote:
>>
>> Update the expected SPCR binary to match the corrected field
>> sequence after the Terminal Type and Language fields were swapped
>> back to their proper order.
>>
>> This fixes the qtest-riscv64/bios-tables-test CI failure:
>>    https://gitlab.com/TaoTang/qemu/-/jobs/13879552268
>>
>> Fixes: 977c6fefcd04 ("hw/acpi: correct field sequence in SPCR table")
>> Signed-off-by: Chao Liu <chao.liu.zevorn@gmail.com>
>> Tested-by: Tao Tang <tangtao1634@phytium.com.cn>
> 
> Thanks for the fix!
> 
> Do you guys (Heinrich and Chao) mind if I squash this with "hw/acpi:
> correct field sequence in SPCR table"? They are both in my tree and if
> I can squash them then it keeps the tree bisectable
> 
> Alistair

Sounds reasonable to me.

Best regards

Heinrich

> 
>> ---
>>   tests/data/acpi/riscv64/virt/SPCR | Bin 90 -> 90 bytes
>>   1 file changed, 0 insertions(+), 0 deletions(-)
>>
>> diff --git a/tests/data/acpi/riscv64/virt/SPCR b/tests/data/acpi/riscv64/virt/SPCR
>> index 09617f8793a6f7b1f08172f735b58aa748671540..59d2c8f7f215a604612cbd0294c18bc6301e208a 100644
>> GIT binary patch
>> delta 10
>> Rcma!wnqbGo%rMbG3IGpM0&@TW
>>
>> delta 10
>> Rcma!wnqbGoz&z1G3IGpJ0&@TW
>>
>> --
>> 2.53.0
>>
>>

Re: [PATCH v1] tests/data/acpi: Update SPCR golden-ref for RISC-V virt

Posted by Alistair Francis 1 month, 1 week ago

On Fri, Apr 17, 2026 at 6:05 AM Heinrich Schuchardt
<heinrich.schuchardt@canonical.com> wrote:
>
> On 4/16/26 04:35, Alistair Francis wrote:
> > On Sun, Apr 12, 2026 at 11:25 AM Chao Liu <chao.liu.zevorn@gmail.com> wrote:
> >>
> >> Update the expected SPCR binary to match the corrected field
> >> sequence after the Terminal Type and Language fields were swapped
> >> back to their proper order.
> >>
> >> This fixes the qtest-riscv64/bios-tables-test CI failure:
> >>    https://gitlab.com/TaoTang/qemu/-/jobs/13879552268
> >>
> >> Fixes: 977c6fefcd04 ("hw/acpi: correct field sequence in SPCR table")
> >> Signed-off-by: Chao Liu <chao.liu.zevorn@gmail.com>
> >> Tested-by: Tao Tang <tangtao1634@phytium.com.cn>
> >
> > Thanks for the fix!
> >
> > Do you guys (Heinrich and Chao) mind if I squash this with "hw/acpi:
> > correct field sequence in SPCR table"? They are both in my tree and if
> > I can squash them then it keeps the tree bisectable
> >
> > Alistair
>
> Sounds reasonable to me.

Urgh, squashing them causes a checkpatch failure

```
ERROR: Do not add expected files together with tests, follow
instructions in tests/qtest/bios-tables-test.c. Files

 tests/data/acpi/riscv64/virt/SPCR

and

 hw/acpi/aml-build.c

found in the same patch

total: 1 errors, 0 warnings, 12 lines checked
```

I'm going to drop this patch and the original patch, Heinrich can you
re-send a new version with no build, check or checkpatch failures?

I think UEFI usually disables the test, adds the feature/fix and then
re-enables the test

Alistair

Re: [PATCH v1] tests/data/acpi: Update SPCR golden-ref for RISC-V virt

Posted by Daniel Henrique Barboza 1 month, 2 weeks ago


On 4/11/2026 10:25 PM, Chao Liu wrote:
> Update the expected SPCR binary to match the corrected field
> sequence after the Terminal Type and Language fields were swapped
> back to their proper order.
> 
> This fixes the qtest-riscv64/bios-tables-test CI failure:
>    https://gitlab.com/TaoTang/qemu/-/jobs/13879552268
> 
> Fixes: 977c6fefcd04 ("hw/acpi: correct field sequence in SPCR table")
> Signed-off-by: Chao Liu <chao.liu.zevorn@gmail.com>
> Tested-by: Tao Tang <tangtao1634@phytium.com.cn>
> ---


Reviewed-by: Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com>


>   tests/data/acpi/riscv64/virt/SPCR | Bin 90 -> 90 bytes
>   1 file changed, 0 insertions(+), 0 deletions(-)
> 
> diff --git a/tests/data/acpi/riscv64/virt/SPCR b/tests/data/acpi/riscv64/virt/SPCR
> index 09617f8793a6f7b1f08172f735b58aa748671540..59d2c8f7f215a604612cbd0294c18bc6301e208a 100644
> GIT binary patch
> delta 10
> Rcma!wnqbGo%rMbG3IGpM0&@TW
> 
> delta 10
> Rcma!wnqbGoz&z1G3IGpJ0&@TW
>