Commit 0ea0538fae516f9b4 removed the default machine of the sh4
binaries, so a lot of iotests are failing now without such a default
machine. Teach the iotest harness to use the "r2d" machine instead
to fix this problem.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 v2: "r2d" only works on little endian, so don't try to use it for sh4eb

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

diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py
index 0b32eec119..8cd620c202 100644
--- a/tests/qemu-iotests/testenv.py
+++ b/tests/qemu-iotests/testenv.py
@@ -244,6 +244,7 @@ def __init__(self, source_dir: str, build_dir: str,
             ('riscv32', 'virt'),
             ('riscv64', 'virt'),
             ('rx', 'gdbsim-r5f562n8'),
+            ('sh4', 'r2d'),
             ('tricore', 'tricore_testboard')
         )
         for suffix, machine in machine_map:
-- 
2.46.0

25.09.2024 10:24, Thomas Huth wrote:
> Commit 0ea0538fae516f9b4 removed the default machine of the sh4
> binaries, so a lot of iotests are failing now without such a default
> machine. Teach the iotest harness to use the "r2d" machine instead
> to fix this problem.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   v2: "r2d" only works on little endian, so don't try to use it for sh4eb

Hm.  The v1 of this patch (with sh4eb addition) has already been merged
to master.

I did a single pull request during my vacation (a week ago), and it contained
a very fresh patch which received further discussion after I picked it up, but
I haven't noticed.

So we should now remove the already added sh4eb from there, it looks like.. :(

I'll submit a patch doing that later today, hopefully.

Thanks,

/mjt

On 26/09/2024 12.24, Michael Tokarev wrote:
> 25.09.2024 10:24, Thomas Huth wrote:
>> Commit 0ea0538fae516f9b4 removed the default machine of the sh4
>> binaries, so a lot of iotests are failing now without such a default
>> machine. Teach the iotest harness to use the "r2d" machine instead
>> to fix this problem.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>   v2: "r2d" only works on little endian, so don't try to use it for sh4eb
> 
> Hm.  The v1 of this patch (with sh4eb addition) has already been merged
> to master.
> 
> I did a single pull request during my vacation (a week ago), and it contained
> a very fresh patch which received further discussion after I picked it up, but
> I haven't noticed.
> 
> So we should now remove the already added sh4eb from there, it looks like.. :(
> 
> I'll submit a patch doing that later today, hopefully.

I'm planning to provide a patch to remove sh4eb-softmmu completely (since it 
is useless nowadays) ... I can add it there, too.

  Thomas

26.09.2024 13:55, Thomas Huth wrote:
..
> I'm planning to provide a patch to remove sh4eb-softmmu completely (since it is useless nowadays) ... I can add it there, too.

That'll do it too, for sure.

Thanks,

/mjt