[v2] tests: add (riscv virt) machine mapping to testenv

[PATCH v2] tests: add (riscv virt) machine mapping to testenv

Posted by laokz 3 years, 11 months ago

Some qemu-iotests(040 etc) use PCI disk to do test. Without the
mapping, RISC-V flavor use spike as default machine which has no
PCI bus, causing test failure.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/894

Signed-off-by: Kai Zhang <laokz@foxmail.com>
---
Thanks for the detailed info. Corrected S-o-b tag.

 tests/qemu-iotests/testenv.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py
index 0f32897fe8..975f26a785 100644
--- a/tests/qemu-iotests/testenv.py
+++ b/tests/qemu-iotests/testenv.py
@@ -238,6 +238,8 @@ def __init__(self, imgfmt: str, imgproto: str, aiomode: str,
             ('aarch64', 'virt'),
             ('avr', 'mega2560'),
             ('m68k', 'virt'),
+            ('riscv32', 'virt'),
+            ('riscv64', 'virt'),
             ('rx', 'gdbsim-r5f562n8'),
             ('tricore', 'tricore_testboard')
         )
-- 
2.34.1

Re: [PATCH v2] tests: add (riscv virt) machine mapping to testenv

Posted by Alistair Francis 3 years, 11 months ago

On Tue, Mar 8, 2022 at 2:34 PM laokz <laokz@foxmail.com> wrote:
>
> Some qemu-iotests(040 etc) use PCI disk to do test. Without the
> mapping, RISC-V flavor use spike as default machine which has no
> PCI bus, causing test failure.
>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/894
>
> Signed-off-by: Kai Zhang <laokz@foxmail.com>

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

Alistair

> ---
> Thanks for the detailed info. Corrected S-o-b tag.
>
>  tests/qemu-iotests/testenv.py | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py
> index 0f32897fe8..975f26a785 100644
> --- a/tests/qemu-iotests/testenv.py
> +++ b/tests/qemu-iotests/testenv.py
> @@ -238,6 +238,8 @@ def __init__(self, imgfmt: str, imgproto: str, aiomode: str,
>              ('aarch64', 'virt'),
>              ('avr', 'mega2560'),
>              ('m68k', 'virt'),
> +            ('riscv32', 'virt'),
> +            ('riscv64', 'virt'),
>              ('rx', 'gdbsim-r5f562n8'),
>              ('tricore', 'tricore_testboard')
>          )
> --
> 2.34.1
>
>

Re: [PATCH v2] tests: add (riscv virt) machine mapping to testenv

Posted by Hanna Reitz 3 years, 11 months ago

On 08.03.22 05:33, laokz wrote:
> Some qemu-iotests(040 etc) use PCI disk to do test. Without the
> mapping, RISC-V flavor use spike as default machine which has no
> PCI bus, causing test failure.
>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/894
>
> Signed-off-by: Kai Zhang <laokz@foxmail.com>
> ---
> Thanks for the detailed info. Corrected S-o-b tag.
>
>   tests/qemu-iotests/testenv.py | 2 ++
>   1 file changed, 2 insertions(+)

Thanks!

I’ve applied this patch to my block branch:

https://gitlab.com/hreitz/qemu/-/commits/block

Re: [PATCH v2] tests: add (riscv virt) machine mapping to testenv

Posted by laokz 3 years, 11 months ago

On Wed, Mar 09, 2022 at 15:56 +0100，Hanna Reitz wrote：
> On 08.03.22 05:33, laokz wrote:
> > Some qemu-iotests(040 etc) use PCI disk to do test. Without the
> > mapping, RISC-V flavor use spike as default machine which has no
> > PCI bus, causing test failure.
> > 
> > Resolves: https://gitlab.com/qemu-project/qemu/-/issues/894
> > 
> > Signed-off-by: Kai Zhang <laokz@foxmail.com>
> > ---
> > Thanks for the detailed info. Corrected S-o-b tag.
> > 
> >   tests/qemu-iotests/testenv.py | 2 ++
> >   1 file changed, 2 insertions(+)
> 
> Thanks!
> 
> I’ve applied this patch to my block branch:
> 
> https://gitlab.com/hreitz/qemu/-/commits/block
> 
Got it. Thanks for your help!