--disable-tcg qtest/avocado fixes for ppc64
cover --disable-tcg qtest/avocado fixes for ppc64
Hi,
'make check' and 'make check-avocado' in a ppc64 host, using a QEMU built with --disable-tcg, fails in a handful of tests/files due to the lack of TCG support not being accounted for. The tests usually fall back to KVM acceleration, and when running in an IBM POWER server this accel type isn't able to run any other machine but 'pseries'.
This series aims to fix it by checking for CONFIG_TCG in qtest/meson.build, and using require_accelerator('tcg') in avocado tests. I avoided changing the behavior when running the tests in other host architectures because I can't assert about how KVM behaves in x86 and aarch64. Patches 1, 2 and 4 were limited to ppc/ppc64 tests only because of that.
Patch 5 is something that I am fairly confident that affects all archs so the change is made in the common code for everyone.
Daniel Henrique Barboza (5):
qtest/meson.build: check CONFIG_TCG for prom-env-test in qtests_ppc qtest/meson.build: check CONFIG_TCG for boot-serial-test in qtests_ppc avocado/boot_linux_console.py: check for tcg in test_ppc_powernv8/9 avocado/boot_linux_console.py: check tcg accel in test_ppc64_e500 avocado/replay_kernel.py: make tcg-icount check in run_vm()
tests/avocado/boot_linux_console.py | 5 +++++ tests/avocado/replay_kernel.py | 4 ++++ tests/qtest/meson.build | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-)
Signature · 1 line
2.35.1
PATCH 1/5 qtest/meson.build: check CONFIG_TCG for prom-env-test in qtests_ppc
'prom-env-test' is a TCG test that will fail if QEMU is compiled with --disable-tcg:
$ QTEST_QEMU_BINARY=./qemu-system-ppc64 ./tests/qtest/prom-env-test /ppc64/prom-env/mac99: qemu-system-ppc64: -accel tcg: invalid accelerator tcg (... hangs indefinitely ...)
Fix it by checking CONFIG_TCG before compiling prom-env-test.
--- tests/qtest/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tests/qtest/meson.build +2 -1
@@ -160,7 +160,8 @@ qtests_ppc = \ (slirp.found() ? ['test-netfilter'] : []) + \ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \ (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) + \ - ['boot-order-test', 'prom-env-test', 'boot-serial-test'] \ + (config_all_devices.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) + \ + ['boot-order-test', 'boot-serial-test'] qtests_ppc64 = \ qtests_ppc + \
Signature · 1 line
2.35.1
Re: [PATCH 1/5] qtest/meson.build: check CONFIG_TCG for prom-env-test in qtests_ppc
Quoted 8 lines · Daniel Henrique Barboza
'prom-env-test' is a TCG test that will fail if QEMU is compiled with --disable-tcg:
$ QTEST_QEMU_BINARY=./qemu-system-ppc64 ./tests/qtest/prom-env-test /ppc64/prom-env/mac99: qemu-system-ppc64: -accel tcg: invalid accelerator tcg (... hangs indefinitely ...)Fix it by checking
CONFIG_TCGbefore compiling prom-env-test.
I guess it could be made somehow working by using KVM-PR for the mac machines ... but considering the bad shape of KVM-PR nowadays, I think it's fair to limit the test to TCG-only now.
Quoted 20 lines
Cc Thomas Huth <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>--- tests/qtest/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)tests/qtest/meson.build +2
-1@@ -160,7 +160,8 @@ qtests_ppc = \ (slirp.found() ? ['test-netfilter'] : []) + \ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \ (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) + \ - ['boot-order-test', 'prom-env-test', 'boot-serial-test'] \ + (config_all_devices.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) + \ + ['boot-order-test', 'boot-serial-test'] qtests_ppc64 = \ qtests_ppc + \
PATCH 2/5 qtest/meson.build: check CONFIG_TCG for boot-serial-test in qtests_ppc
In reply to Daniel Henrique Barboza'boot-serial-test' does not work with a QEMU built with --disable-tcg in a IBM POWER9 host. The reason is that without TCG QEMU will default to KVM acceleration, but then the KVM module in IBM POWER hosts aren't able to handle other CPUs.
The result is that the test will break with a KVM error when trying to ruin the ppce500 test:
$ QTEST_QEMU_BINARY=./qemu-system-ppc64 ./tests/qtest/boot-serial-test /ppc64/boot-serial/ppce500: qemu-system-ppc64: -accel tcg: invalid accelerator tcg error: kvm run failed Invalid argument NIP 0000000000f00000 LR 0000000000000000 CTR 0000000000000000 XER 0000000000000000 CPU#0 MSR 0000000000000000 HID0 0000000000000000 HF 24020002 iidx 1 didx 1 TB 00000000 00000000 DECR 0 (...) ** (./tests/qtest/boot-serial-test:1935760): ERROR **: 07:44:03.010: Failed to find expected string. Please check '/tmp/qtest-boot-serial-sJ78sqg'
Fix it by checking CONFIG_TCG before compiling boot-serial-test.
--- tests/qtest/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tests/qtest/meson.build +2 -1
@@ -161,7 +161,8 @@ qtests_ppc = \ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \ (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) + \ (config_all_devices.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) + \ - ['boot-order-test', 'boot-serial-test'] + (config_all_devices.has_key('CONFIG_TCG') ? ['boot-serial-test'] : []) + \ + ['boot-order-test'] qtests_ppc64 = \ qtests_ppc + \
Signature · 1 line
2.35.1
Re: [PATCH 2/5] qtest/meson.build: check CONFIG_TCG for boot-serial-test in qtests_ppc
Quoted 30 lines · Daniel Henrique Barboza
'boot-serial-test' does not work with a QEMU built with --disable-tcg in a IBM POWER9 host. The reason is that without TCG QEMU will default to KVM acceleration, but then the KVM module in IBM POWER hosts aren't able to handle other CPUs.
The result is that the test will break with a KVM error when trying to ruin the ppce500 test:
$ QTEST_QEMU_BINARY=./qemu-system-ppc64 ./tests/qtest/boot-serial-test /ppc64/boot-serial/ppce500: qemu-system-ppc64: -accel tcg: invalid accelerator tcg error: kvm run failed Invalid argument NIP 0000000000f00000 LR 0000000000000000 CTR 0000000000000000 XER 0000000000000000 CPU#0 MSR 0000000000000000 HID0 0000000000000000 HF 24020002 iidx 1 didx 1 TB 00000000 00000000 DECR 0 (...) ** (./tests/qtest/boot-serial-test:1935760): ERROR **: 07:44:03.010: Failed to find expected string. Please check '/tmp/qtest-boot-serial-sJ78sqg'Fix it by checking
CONFIG_TCGbefore compiling boot-serial-test.Cc Thomas Huth <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>--- tests/qtest/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)tests/qtest/meson.build +0
-0
tests/qtest/meson.build qtests_ppc = \ · line 168
Quoted 9 lines
tests/qtest/meson.build +2
-1@@ -161,7 +161,8 @@ qtests_ppc = \ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \ (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) + \ (config_all_devices.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) + \ - ['boot-order-test', 'boot-serial-test'] + (config_all_devices.has_key('CONFIG_TCG') ? ['boot-serial-test'] : []) + \ + ['boot-order-test'] qtests_ppc64 = \ qtests_ppc + \
PATCH 3/5 avocado/boot_linux_console.py: check for tcg in test_ppc_powernv8/9
In reply to Daniel Henrique BarbozaThe PowerNV8/9 machines does not work with KVM acceleration, meaning that boot_linux_console.py:BootLinuxConsole.test_ppc_powernv8/9 tests will always fail when QEMU is compiled with --disable-tcg:
ERROR 1-tests/avocado/boot_linux_console.py:BootLinuxConsole.test_ppc_powernv8
-> VMLaunchFailure: ConnectError: Failed to establish session:
[Errno 104] Connection reset by peer
Exit code: 1
Command: ./qemu-system-ppc64 -display none -vga none -chardev socket,id=mon,path=/var/tmp/avo_qemu_sock_no19zg0m/qemu-1936936-7fffa77cff98-monitor.sock -mon chardev=mon,mode=control -machine powernv8 -chardev socket,id=console,path=/var/tmp/avo_qemu_sock_no19zg0m/qemu-1936936-7fffa77cff98-console.sock,server=on,wait=off -serial chardev:console -kernel /home/danielhb/avocado/data/cache/by_location/4514304e2c4ee84c5f0b5c8bacedda783891df68/zImage.epapr -append console=tty0 console=hvc0 -device pcie-pci-bridge,id=bridge1,bus=pcie.1,addr=0x0 -device nvme,bus=pcie.2,addr=0x0,serial=1234 -device e1000e,bus=bridge1,addr=0x3 -device nec-usb-xhci,bus=bridge1,addr=0x2
Output: qemu-system-ppc64: The powernv machine does not work with KVM acceleration
Let's add the TCG accel requirement in both tests to skip them if we don't have TCG support available.
--- tests/avocado/boot_linux_console.py | 3 +++ 1 file changed, 3 insertions(+)
tests/avocado/boot_linux_console.py +3 -0
@@ -1170,6 +1170,7 @@ def test_ppc64_e500(self): self.do_test_advcal_2018('19', tar_hash, 'uImage') def do_test_ppc64_powernv(self, proc): + self.require_accelerator("tcg") images_url = ('https://github.com/open-power/op-build/releases/download/v2.7/') kernel_url = images_url + 'zImage.epapr'
@@ -1194,6 +1195,7 @@ def test_ppc_powernv8(self): """ :avocado: tags=arch:ppc64 :avocado: tags=machine:powernv8 + :avocado: tags=accel:tcg """ self.do_test_ppc64_powernv('P8')
@@ -1201,6 +1203,7 @@ def test_ppc_powernv9(self): """ :avocado: tags=arch:ppc64 :avocado: tags=machine:powernv9 + :avocado: tags=accel:tcg """ self.do_test_ppc64_powernv('P9')
Signature · 1 line
2.35.1
Re: [PATCH 3/5] avocado/boot_linux_console.py: check for tcg in test_ppc_powernv8/9
Quoted 11 lines · Daniel Henrique Barboza
The PowerNV8/9 machines does not work with KVM acceleration, meaning that boot_linux_console.py:BootLinuxConsole.test_ppc_powernv8/9 tests will always fail when QEMU is compiled with --disable-tcg:
ERROR 1-tests/avocado/boot_linux_console.py:BootLinuxConsole.test_ppc_powernv8
-> VMLaunchFailure: ConnectError: Failed to establish session:
[Errno 104] Connection reset by peer
Exit code: 1
Command: ./qemu-system-ppc64 -display none -vga none -chardev socket,id=mon,path=/var/tmp/avo_qemu_sock_no19zg0m/qemu-1936936-7fffa77cff98-monitor.sock -mon chardev=mon,mode=control -machine powernv8 -chardev socket,id=console,path=/var/tmp/avo_qemu_sock_no19zg0m/qemu-1936936-7fffa77cff98-console.sock,server=on,wait=off -serial chardev:console -kernel/home/danielhb/avocado/data/cache/by_location/4514304e2c4ee84c5f0b5c8bacedda783891df68/zImage.epapr-append console=tty0 console=hvc0 -device pcie-pci-bridge,id=bridge1,bus=pcie.1,addr=0x0 -device nvme,bus=pcie.2,addr=0x0,serial=1234 -device e1000e,bus=bridge1,addr=0x3 -device nec-usb-xhci,bus=bridge1,addr=0x2
Output: qemu-system-ppc64: The powernv machine does not work with KVM acceleration
Quoted 4 lines
Let's add the TCG accel requirement in both tests to skip them if we don't have TCG support available.
Signed-off-by Daniel Henrique Barboza <[email protected]>
Thanks,
C.
Quoted 32 lines
--- tests/avocado/boot_linux_console.py | 3 +++ 1 file changed, 3 insertions(+)tests/avocado/boot_linux_console.py +3
-0@@ -1170,6 +1170,7 @@ def test_ppc64_e500(self): self.do_test_advcal_2018('19', tar_hash, 'uImage') def do_test_ppc64_powernv(self, proc): + self.require_accelerator("tcg") images_url = ('https://github.com/open-power/op-build/releases/download/v2.7/') kernel_url = images_url + 'zImage.epapr'@@ -1194,6 +1195,7 @@ def test_ppc_powernv8(self): """ :avocado: tags=arch:ppc64 :avocado: tags=machine:powernv8 + :avocado: tags=accel:tcg """ self.do_test_ppc64_powernv('P8')@@ -1201,6 +1203,7 @@ def test_ppc_powernv9(self): """ :avocado: tags=arch:ppc64 :avocado: tags=machine:powernv9 + :avocado: tags=accel:tcg """ self.do_test_ppc64_powernv('P9')
Re: [PATCH 3/5] avocado/boot_linux_console.py: check for tcg in test_ppc_powernv8/9
In reply to Daniel Henrique BarbozaQuoted 11 lines · Daniel Henrique Barboza
The PowerNV8/9 machines does not work with KVM acceleration, meaning that boot_linux_console.py:BootLinuxConsole.test_ppc_powernv8/9 tests will always fail when QEMU is compiled with --disable-tcg:
ERROR 1-tests/avocado/boot_linux_console.py:BootLinuxConsole.test_ppc_powernv8
-> VMLaunchFailure: ConnectError: Failed to establish session:
[Errno 104] Connection reset by peer
Exit code: 1
Command: ./qemu-system-ppc64 -display none -vga none -chardev socket,id=mon,path=/var/tmp/avo_qemu_sock_no19zg0m/qemu-1936936-7fffa77cff98-monitor.sock -mon chardev=mon,mode=control -machine powernv8 -chardev socket,id=console,path=/var/tmp/avo_qemu_sock_no19zg0m/qemu-1936936-7fffa77cff98-console.sock,server=on,wait=off -serial chardev:console -kernel/home/danielhb/avocado/data/cache/by_location/4514304e2c4ee84c5f0b5c8bacedda783891df68/zImage.epapr-append console=tty0 console=hvc0 -device pcie-pci-bridge,id=bridge1,bus=pcie.1,addr=0x0 -device nvme,bus=pcie.2,addr=0x0,serial=1234 -device e1000e,bus=bridge1,addr=0x3 -device nec-usb-xhci,bus=bridge1,addr=0x2
Output: qemu-system-ppc64: The powernv machine does not work with KVM acceleration
Quoted 7 lines
Let's add the TCG accel requirement in both tests to skip them if we don't have TCG support available.
Signed-off-by Daniel Henrique Barboza <[email protected]>--- tests/avocado/boot_linux_console.py | 3 +++ 1 file changed, 3 insertions(+)
PATCH 4/5 avocado/boot_linux_console.py: check tcg accel in test_ppc64_e500
In reply to Daniel Henrique BarbozaSome ppc64 hosts (e.g. IBM POWER hosts) aren't able to run the e500 machine using KVM accel. Skip this test if TCG accel isn't available.
--- tests/avocado/boot_linux_console.py | 2 ++ 1 file changed, 2 insertions(+)
tests/avocado/boot_linux_console.py +2 -0
@@ -1165,7 +1165,9 @@ def test_ppc64_e500(self): :avocado: tags=arch:ppc64 :avocado: tags=machine:ppce500 :avocado: tags=cpu:e5500 + :avocado: tags=accel:tcg """ + self.require_accelerator("tcg") tar_hash = '6951d86d644b302898da2fd701739c9406527fe1' self.do_test_advcal_2018('19', tar_hash, 'uImage')
Signature · 1 line
2.35.1
Re: [PATCH 4/5] avocado/boot_linux_console.py: check tcg accel in test_ppc64_e500
Quoted 5 lines · Daniel Henrique Barboza
Some ppc64 hosts (e.g. IBM POWER hosts) aren't able to run the e500 machine using KVM accel. Skip this test if TCG accel isn't available.
Cc Cleber Rosa <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>
Thanks,
C.
Quoted 18 lines
--- tests/avocado/boot_linux_console.py | 2 ++ 1 file changed, 2 insertions(+)tests/avocado/boot_linux_console.py +2
-0@@ -1165,7 +1165,9 @@ def test_ppc64_e500(self): :avocado: tags=arch:ppc64 :avocado: tags=machine:ppce500 :avocado: tags=cpu:e5500 + :avocado: tags=accel:tcg """ + self.require_accelerator("tcg") tar_hash = '6951d86d644b302898da2fd701739c9406527fe1' self.do_test_advcal_2018('19', tar_hash, 'uImage')
PATCH 5/5 avocado/replay_kernel.py: make tcg-icount check in run_vm()
In reply to Daniel Henrique BarbozaThe icount framework relies on TCG availability. If QEMU is built with --disable-tcg we won't have icount either, and then this test will fail with the following message in an IBM POWER9 host:
tests/avocado/replay_kernel.py:ReplayKernelNormal.test_ppc64_pseries:
ERROR: ConnectError: Failed to establish session:
(...) /11-tests_avocado_replay_kernel.py_ReplayKernelNormal.test_ppc64_pseries/replay.bin:
cannot configure icount, TCG support not available
Although this was revealed in a specific ppc64 scenario, the TCG check is being done in the common code inside run_vm() because all archs need TCG to have access to icount.
--- tests/avocado/replay_kernel.py | 4 ++++ 1 file changed, 4 insertions(+)
tests/avocado/replay_kernel.py +4 -0
@@ -36,6 +36,9 @@ class ReplayKernelBase(LinuxKernelTest): def run_vm(self, kernel_path, kernel_command_line, console_pattern, record, shift, args, replay_path): + # icount requires TCG to be available + self.require_accelerator('tcg') + logger = logging.getLogger('replay') start_time = time.time() vm = self.get_vm()
@@ -243,6 +246,7 @@ def test_ppc64_pseries(self): """ :avocado: tags=arch:ppc64 :avocado: tags=machine:pseries + :avocado: tags=accel:tcg """ kernel_url = ('https://archives.fedoraproject.org/pub/archive' '/fedora-secondary/releases/29/Everything/ppc64le/os'
Signature · 1 line
2.35.1
Re: [PATCH 5/5] avocado/replay_kernel.py: make tcg-icount check in run_vm()
Quoted 10 lines · Daniel Henrique Barboza
The icount framework relies on TCG availability. If QEMU is built with --disable-tcg we won't have icount either, and then this test will fail with the following message in an IBM POWER9 host:
tests/avocado/replay_kernel.py:ReplayKernelNormal.test_ppc64_pseries:
ERROR: ConnectError: Failed to establish session:
(...) /11-tests_avocado_replay_kernel.py_ReplayKernelNormal.test_ppc64_pseries/replay.bin:
cannot configure icount, TCG support not available
Quoted 6 lines
Although this was revealed in a specific ppc64 scenario, the TCG check is being done in the common code inside
run_vm()because all archs need TCG to have access to icount.Cc Pavel Dovgalyuk <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>
Pavel,
Should I take this patch through the ppc tree ?
Thanks,
C.
Quoted 26 lines
--- tests/avocado/replay_kernel.py | 4 ++++ 1 file changed, 4 insertions(+)tests/avocado/replay_kernel.py +4
-0@@ -36,6 +36,9 @@ class ReplayKernelBase(LinuxKernelTest): def run_vm(self, kernel_path, kernel_command_line, console_pattern, record, shift, args, replay_path): + # icount requires TCG to be available + self.require_accelerator('tcg') + logger = logging.getLogger('replay') start_time = time.time() vm = self.get_vm()@@ -243,6 +246,7 @@ def test_ppc64_pseries(self): """ :avocado: tags=arch:ppc64 :avocado: tags=machine:pseries + :avocado: tags=accel:tcg """ kernel_url = ('https://archives.fedoraproject.org/pub/archive' '/fedora-secondary/releases/29/Everything/ppc64le/os'
Re: [PATCH 5/5] avocado/replay_kernel.py: make tcg-icount check in run_vm()
Quoted 20 lines · Cédric Le Goater
Quoted 9 lines · Daniel Henrique Barboza
The icount framework relies on TCG availability. If QEMU is built with --disable-tcg we won't have icount either, and then this test will fail with the following message in an IBM POWER9 host:
tests/avocado/replay_kernel.py:ReplayKernelNormal.test_ppc64_pseries:
ERROR: ConnectError: Failed to establish session:
(...) /11-tests_avocado_replay_kernel.py_ReplayKernelNormal.test_ppc64_pseries/replay.bin:Quoted 8 lines
cannot configure icount, TCG support not available
Although this was revealed in a specific ppc64 scenario, the TCG check is being done in the common code inside
run_vm()because all archs need TCG to have access to icount.Cc Pavel Dovgalyuk <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>
Quoted 5 lines
Reviewed-by Cédric Le Goater <[email protected]>Pavel,
Should I take this patch through the ppc tree ?
Nobody has queued it yet, so I think it is ok.
Quoted 33 lines
Thanks,
C.
Quoted 26 lines
---
tests/avocado/replay_kernel.py| 4 ++++1 file changed, 4 insertions(+)tests/avocado/replay_kernel.py +0
-0@@ -36,6 +36,9 @@ class ReplayKernelBase(LinuxKernelTest): def run_vm(self, kernel_path, kernel_command_line, console_pattern,record, shift, args,
replay_path):
+ # icount requires TCG to be available +self.require_accelerator('tcg')
+
logger =logging.getLogger('replay')start_time=time.time()
vm =self.get_vm()tests/avocado/replay_kernel.py +0
-0@@ -243,6 +246,7 @@ def test_ppc64_pseries(self):"""
:avocado: tags=arch:ppc64
:avocado: tags=machine:pseries
+ :avocado: tags=accel:tcg
"""
kernel_url= ('https://archives.fedoraproject.org/pub/archive''/fedora-secondary/releases/29/Everything/ppc64le/os'
Re: [PATCH 5/5] avocado/replay_kernel.py: make tcg-icount check in run_vm()
Quoted 20 lines · Pavel Dovgalyuk
Quoted 19 lines · Cédric Le Goater
Quoted 16 lines · Daniel Henrique Barboza
The icount framework relies on TCG availability. If QEMU is built with --disable-tcg we won't have icount either, and then this test will fail with the following message in an IBM POWER9 host:
tests/avocado/replay_kernel.py:ReplayKernelNormal.test_ppc64_pseries:
ERROR: ConnectError: Failed to establish session:
(...) /11-tests_avocado_replay_kernel.py_ReplayKernelNormal.test_ppc64_pseries/replay.bin:
cannot configure icount, TCG support not availableAlthough this was revealed in a specific ppc64 scenario, the TCG check is being done in the common code inside
run_vm()because all archs need TCG to have access to icount.Cc Pavel Dovgalyuk <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>
Quoted 7 lines
Quoted 5 lines
Reviewed-by Cédric Le Goater <[email protected]>Pavel,
Should I take this patch through the ppc tree ?
Nobody has queued it yet, so I think it is ok.
Since these are fixes, I will at end of the week.
Thanks,
C.
Quoted 26 lines · Daniel Henrique Barboza
Hi,
'make check' and 'make check-avocado' in a ppc64 host, using a QEMU built with --disable-tcg, fails in a handful of tests/files due to the lack of TCG support not being accounted for. The tests usually fall back to KVM acceleration, and when running in an IBM POWER server this accel type isn't able to run any other machine but 'pseries'.
This series aims to fix it by checking for
CONFIG_TCGin qtest/meson.build, and usingrequire_accelerator('tcg')in avocado tests. I avoided changing the behavior when running the tests in other host architectures because I can't assert about how KVM behaves in x86 and aarch64. Patches 1, 2 and 4 were limited to ppc/ppc64 tests only because of that.Patch 5 is something that I am fairly confident that affects all archs so the change is made in the common code for everyone.
Daniel Henrique Barboza (5):
qtest/meson.build: checkCONFIG_TCGfor prom-env-test inqtests_ppcqtest/meson.build: checkCONFIG_TCGfor boot-serial-test inqtests_ppcavocado/boot_linux_console.py: check for tcg in test_ppc_powernv8/9avocado/boot_linux_console.py: check tcg accel intest_ppc64_e500avocado/replay_kernel.py: make tcg-icount check inrun_vm()
Quoted 5 lines
tests/avocado/boot_linux_console.py | 5 +++++ tests/avocado/replay_kernel.py | 4 ++++ tests/qtest/meson.build | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-)
Queued for 7.0
Thanks,
C.