Re: [PATCH 8/9] avocado/ppc_prep_40p.py: check TCG accel in all tests

2022-03-10 Thread Philippe Mathieu-Daudé

On 10/3/22 19:30, Daniel Henrique Barboza wrote:

All tests in the file times out when running in an IBM POWER host and
--disable-tcg with an error like the following:

 Command: ./qemu-system-ppc -display none -vga none (...)
-machine 40p (...)
 Output: qemu-system-ppc: Register sync failed... If you're using
kvm-hv.ko, only "-cpu host" is possible
qemu-system-ppc: kvm_init_vcpu: kvm_arch_init_vcpu failed (0): Invalid argument

Since we don't have a way to detect whether the host is running kvm_hv
or kvm_pr, skip all tests if TCG is not available.

Signed-off-by: Daniel Henrique Barboza 
---
  tests/avocado/ppc_prep_40p.py | 6 ++
  1 file changed, 6 insertions(+)


Reviewed-by: Philippe Mathieu-Daudé 



[PATCH 8/9] avocado/ppc_prep_40p.py: check TCG accel in all tests

2022-03-10 Thread Daniel Henrique Barboza
All tests in the file times out when running in an IBM POWER host and
--disable-tcg with an error like the following:

Command: ./qemu-system-ppc -display none -vga none (...)
-machine 40p (...)
Output: qemu-system-ppc: Register sync failed... If you're using
kvm-hv.ko, only "-cpu host" is possible
qemu-system-ppc: kvm_init_vcpu: kvm_arch_init_vcpu failed (0): Invalid argument

Since we don't have a way to detect whether the host is running kvm_hv
or kvm_pr, skip all tests if TCG is not available.

Signed-off-by: Daniel Henrique Barboza 
---
 tests/avocado/ppc_prep_40p.py | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/tests/avocado/ppc_prep_40p.py b/tests/avocado/ppc_prep_40p.py
index 4bd956584d..d4f1eb7e1d 100644
--- a/tests/avocado/ppc_prep_40p.py
+++ b/tests/avocado/ppc_prep_40p.py
@@ -28,7 +28,9 @@ def test_factory_firmware_and_netbsd(self):
 :avocado: tags=machine:40p
 :avocado: tags=os:netbsd
 :avocado: tags=slowness:high
+:avocado: tags=accel:tcg
 """
+self.require_accelerator("tcg")
 bios_url = ('http://ftpmirror.your.org/pub/misc/'
 'ftp.software.ibm.com/rs6000/firmware/'
 '7020-40p/P12H0456.IMG')
@@ -51,7 +53,9 @@ def test_openbios_192m(self):
 """
 :avocado: tags=arch:ppc
 :avocado: tags=machine:40p
+:avocado: tags=accel:tcg
 """
+self.require_accelerator("tcg")
 self.vm.set_console()
 self.vm.add_args('-m', '192') # test fw_cfg
 
@@ -65,7 +69,9 @@ def test_openbios_and_netbsd(self):
 :avocado: tags=arch:ppc
 :avocado: tags=machine:40p
 :avocado: tags=os:netbsd
+:avocado: tags=accel:tcg
 """
+self.require_accelerator("tcg")
 drive_url = ('https://archive.netbsd.org/pub/NetBSD-archive/'
  'NetBSD-7.1.2/iso/NetBSD-7.1.2-prep.iso')
 drive_hash = 'ac6fa2707d888b36d6fa64de6e7fe48e'
-- 
2.35.1