The ppc64 tuxrun tests are currently failing if "slirp" has been
disabled in the binary since they are using "-netdev user" now.
We have to skip the test if this network backend is missing.

Fixes: 6ee3624236 ("improve code coverage for ppc64")
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/avocado/tuxrun_baselines.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_baselines.py
index 3a46e7a745..e12250eabb 100644
--- a/tests/avocado/tuxrun_baselines.py
+++ b/tests/avocado/tuxrun_baselines.py
@@ -184,6 +184,7 @@ def common_tuxrun(self,
 
     def ppc64_common_tuxrun(self, sums, prefix):
         # add device args to command line.
+        self.require_netdev('user')
         self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22',
                          '-device', 'virtio-net,netdev=vnet')
         self.vm.add_args('-netdev', '{"type":"user","id":"hostnet0"}',
-- 
2.31.1

Thomas Huth <thuth@redhat.com> writes:

> The ppc64 tuxrun tests are currently failing if "slirp" has been
> disabled in the binary since they are using "-netdev user" now.
> We have to skip the test if this network backend is missing.
>
> Fixes: 6ee3624236 ("improve code coverage for ppc64")
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Acked-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

On 6/6/23 16:28, Thomas Huth wrote:
> The ppc64 tuxrun tests are currently failing if "slirp" has been
> disabled in the binary since they are using "-netdev user" now.
> We have to skip the test if this network backend is missing.
> 
> Fixes: 6ee3624236 ("improve code coverage for ppc64")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---

Queued in gitlab.com/danielhb/qemu/tree/ppc-next. Thanks,


Daniel

>   tests/avocado/tuxrun_baselines.py | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_baselines.py
> index 3a46e7a745..e12250eabb 100644
> --- a/tests/avocado/tuxrun_baselines.py
> +++ b/tests/avocado/tuxrun_baselines.py
> @@ -184,6 +184,7 @@ def common_tuxrun(self,
>   
>       def ppc64_common_tuxrun(self, sums, prefix):
>           # add device args to command line.
> +        self.require_netdev('user')
>           self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22',
>                            '-device', 'virtio-net,netdev=vnet')
>           self.vm.add_args('-netdev', '{"type":"user","id":"hostnet0"}',

On Tue, 6 Jun 2023 at 19:28, Thomas Huth <thuth@redhat.com> wrote:
>
> The ppc64 tuxrun tests are currently failing if "slirp" has been
> disabled in the binary since they are using "-netdev user" now.
> We have to skip the test if this network backend is missing.

Do the boot tests require networking? I doubt they do.

You could instead remove the -netdev user option if slirp is not present.


>
> Fixes: 6ee3624236 ("improve code coverage for ppc64")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/avocado/tuxrun_baselines.py | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_baselines.py
> index 3a46e7a745..e12250eabb 100644
> --- a/tests/avocado/tuxrun_baselines.py
> +++ b/tests/avocado/tuxrun_baselines.py
> @@ -184,6 +184,7 @@ def common_tuxrun(self,
>
>      def ppc64_common_tuxrun(self, sums, prefix):
>          # add device args to command line.
> +        self.require_netdev('user')
>          self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22',
>                           '-device', 'virtio-net,netdev=vnet')
>          self.vm.add_args('-netdev', '{"type":"user","id":"hostnet0"}',
> --
> 2.31.1
>
>

On 07/06/2023 06.22, Joel Stanley wrote:
> On Tue, 6 Jun 2023 at 19:28, Thomas Huth <thuth@redhat.com> wrote:
>>
>> The ppc64 tuxrun tests are currently failing if "slirp" has been
>> disabled in the binary since they are using "-netdev user" now.
>> We have to skip the test if this network backend is missing.
> 
> Do the boot tests require networking? I doubt they do.
> 
> You could instead remove the -netdev user option if slirp is not present.

Yes, that's an option. Not sure whether it's worth the effort here, though, 
since most of our CI pipelines run with slirp enabled anyway (it's just one 
job, avocado-cfi-ppc64-s390x, which is failing due to this missing check)

  Thomas


>> Fixes: 6ee3624236 ("improve code coverage for ppc64")
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>   tests/avocado/tuxrun_baselines.py | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_baselines.py
>> index 3a46e7a745..e12250eabb 100644
>> --- a/tests/avocado/tuxrun_baselines.py
>> +++ b/tests/avocado/tuxrun_baselines.py
>> @@ -184,6 +184,7 @@ def common_tuxrun(self,
>>
>>       def ppc64_common_tuxrun(self, sums, prefix):
>>           # add device args to command line.
>> +        self.require_netdev('user')
>>           self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22',
>>                            '-device', 'virtio-net,netdev=vnet')
>>           self.vm.add_args('-netdev', '{"type":"user","id":"hostnet0"}',
>> --
>> 2.31.1
>>
>>
>

On 6/6/23 16:28, Thomas Huth wrote:
> The ppc64 tuxrun tests are currently failing if "slirp" has been
> disabled in the binary since they are using "-netdev user" now.
> We have to skip the test if this network backend is missing.
> 
> Fixes: 6ee3624236 ("improve code coverage for ppc64")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>

Thomas, let me know if you need me to queue this up. I'll send a PR in the
next few days.


Daniel

>   tests/avocado/tuxrun_baselines.py | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_baselines.py
> index 3a46e7a745..e12250eabb 100644
> --- a/tests/avocado/tuxrun_baselines.py
> +++ b/tests/avocado/tuxrun_baselines.py
> @@ -184,6 +184,7 @@ def common_tuxrun(self,
>   
>       def ppc64_common_tuxrun(self, sums, prefix):
>           # add device args to command line.
> +        self.require_netdev('user')
>           self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22',
>                            '-device', 'virtio-net,netdev=vnet')
>           self.vm.add_args('-netdev', '{"type":"user","id":"hostnet0"}',

On 6/6/23 21:28, Thomas Huth wrote:
> The ppc64 tuxrun tests are currently failing if "slirp" has been
> disabled in the binary since they are using "-netdev user" now.
> We have to skip the test if this network backend is missing.
> 
> Fixes: 6ee3624236 ("improve code coverage for ppc64")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   tests/avocado/tuxrun_baselines.py | 1 +
>   1 file changed, 1 insertion(+)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>