| Message ID | 20230426180013.14814-1-farosas@suse.de |
|---|---|
| Headers | show |
| Series | target/arm: Allow CONFIG_TCG=n builds | expand |
On Wed, 26 Apr 2023 at 19:00, Fabiano Rosas <farosas@suse.de> wrote: > > Hi, > > Some minor changes: > > - new patch to move a test under CONFIG_TCG (broken on master); > - new patch to document the unsupported CPU test (Philippe); > - changed the test skip message when no KVM or TCG are present (Igor). Applied to target-arm.next; thanks for your persistence in working through the many versions of this patchset. -- PMM
On Tue, 2 May 2023 at 10:55, Peter Maydell <peter.maydell@linaro.org> wrote: > > On Wed, 26 Apr 2023 at 19:00, Fabiano Rosas <farosas@suse.de> wrote: > > > > Hi, > > > > Some minor changes: > > > > - new patch to move a test under CONFIG_TCG (broken on master); > > - new patch to document the unsupported CPU test (Philippe); > > - changed the test skip message when no KVM or TCG are present (Igor). > > Applied to target-arm.next; thanks for your persistence in > working through the many versions of this patchset. Update: I had to drop "gitlab-ci: Check building KVM-only aarch64 target" because it enables a CI job that fails on our aarch64 runner (because it wants to run tests using KVM but that machine isn't configured to allow the runner to use KVM). thanks -- PMM
On Tue, 2 May 2023 at 15:51, Peter Maydell <peter.maydell@linaro.org> wrote: > > On Tue, 2 May 2023 at 10:55, Peter Maydell <peter.maydell@linaro.org> wrote: > > > > On Wed, 26 Apr 2023 at 19:00, Fabiano Rosas <farosas@suse.de> wrote: > > > > > > Hi, > > > > > > Some minor changes: > > > > > > - new patch to move a test under CONFIG_TCG (broken on master); > > > - new patch to document the unsupported CPU test (Philippe); > > > - changed the test skip message when no KVM or TCG are present (Igor). > > > > Applied to target-arm.next; thanks for your persistence in > > working through the many versions of this patchset. > > Update: I had to drop "gitlab-ci: Check building KVM-only aarch64 target" > because it enables a CI job that fails on our aarch64 runner > (because it wants to run tests using KVM but that machine > isn't configured to allow the runner to use KVM). We fixed the runner config, but the CI still fails on that notcg job because it is trying to run tests that explicitly use '-accel tcg': https://gitlab.com/qemu-project/qemu/-/jobs/4212850809#L3595 Something is weird here, because we built without TCG support on an aarch64 host but we still got qemu-system-i386 and qemu-system-x86_64 binaries, which then don't work and cause the tests to fail... -- PMM
Peter Maydell <peter.maydell@linaro.org> writes: > On Tue, 2 May 2023 at 15:51, Peter Maydell <peter.maydell@linaro.org> wrote: >> >> On Tue, 2 May 2023 at 10:55, Peter Maydell <peter.maydell@linaro.org> wrote: >> > >> > On Wed, 26 Apr 2023 at 19:00, Fabiano Rosas <farosas@suse.de> wrote: >> > > >> > > Hi, >> > > >> > > Some minor changes: >> > > >> > > - new patch to move a test under CONFIG_TCG (broken on master); >> > > - new patch to document the unsupported CPU test (Philippe); >> > > - changed the test skip message when no KVM or TCG are present (Igor). >> > >> > Applied to target-arm.next; thanks for your persistence in >> > working through the many versions of this patchset. >> >> Update: I had to drop "gitlab-ci: Check building KVM-only aarch64 target" >> because it enables a CI job that fails on our aarch64 runner >> (because it wants to run tests using KVM but that machine >> isn't configured to allow the runner to use KVM). > > We fixed the runner config, but the CI still fails on that notcg > job because it is trying to run tests that explicitly use > '-accel tcg': > https://gitlab.com/qemu-project/qemu/-/jobs/4212850809#L3595 > > Something is weird here, because we built without TCG support > on an aarch64 host but we still got qemu-system-i386 > and qemu-system-x86_64 binaries, which then don't work > and cause the tests to fail... > Hmm, that's potentially due to Xen. Looks like we need more (!tcg && !kvm) checks. Let me try to reproduce it.
Fabiano Rosas <farosas@suse.de> writes: > Peter Maydell <peter.maydell@linaro.org> writes: > >> On Tue, 2 May 2023 at 15:51, Peter Maydell <peter.maydell@linaro.org> wrote: >>> >>> On Tue, 2 May 2023 at 10:55, Peter Maydell <peter.maydell@linaro.org> wrote: >>> > >>> > On Wed, 26 Apr 2023 at 19:00, Fabiano Rosas <farosas@suse.de> wrote: >>> > > >>> > > Hi, >>> > > >>> > > Some minor changes: >>> > > >>> > > - new patch to move a test under CONFIG_TCG (broken on master); >>> > > - new patch to document the unsupported CPU test (Philippe); >>> > > - changed the test skip message when no KVM or TCG are present (Igor). >>> > >>> > Applied to target-arm.next; thanks for your persistence in >>> > working through the many versions of this patchset. >>> >>> Update: I had to drop "gitlab-ci: Check building KVM-only aarch64 target" >>> because it enables a CI job that fails on our aarch64 runner >>> (because it wants to run tests using KVM but that machine >>> isn't configured to allow the runner to use KVM). >> >> We fixed the runner config, but the CI still fails on that notcg >> job because it is trying to run tests that explicitly use >> '-accel tcg': >> https://gitlab.com/qemu-project/qemu/-/jobs/4212850809#L3595 >> >> Something is weird here, because we built without TCG support >> on an aarch64 host but we still got qemu-system-i386 >> and qemu-system-x86_64 binaries, which then don't work >> and cause the tests to fail... >> > > Hmm, that's potentially due to Xen. Looks like we need more (!tcg && > !kvm) checks. Let me try to reproduce it. Ah right, the test is skipped on my aarch64 host because I don't have genisomage available. So what we need is this: -- >8 -- From: Fabiano Rosas <farosas@suse.de> Date: Tue, 2 May 2023 13:42:14 -0300 Subject: [PATCH] fixup! tests/qtest: Fix tests when no KVM or TCG are present --- tests/qtest/cdrom-test.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c index 26a2400181..09655e6ff0 100644 --- a/tests/qtest/cdrom-test.c +++ b/tests/qtest/cdrom-test.c @@ -205,6 +205,11 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); + if (!qtest_has_accel("tcg") && !qtest_has_accel("kvm")) { + g_test_skip("No KVM or TCG accelerator available"); + return 0; + } + if (exec_genisoimg(genisocheck)) { /* genisoimage not available - so can't run tests */ return g_test_run();
Hi, Some minor changes: - new patch to move a test under CONFIG_TCG (broken on master); - new patch to document the unsupported CPU test (Philippe); - changed the test skip message when no KVM or TCG are present (Igor). CI run: https://gitlab.com/farosas/qemu/-/pipelines/849926795 v10: https://lore.kernel.org/r/20230412121829.14452-1-farosas@suse.de v9: https://lore.kernel.org/r/20230313151058.19645-1-farosas@suse.de v8: https://lore.kernel.org/r/20230309201434.10831-1-farosas@suse.de v7 resend: https://lore.kernel.org/r/20230228192628.26140-1-farosas@suse.de v7: https://lore.kernel.org/r/20230223130841.25916-1-farosas@suse.de v6: https://lore.kernel.org/r/20230217201150.22032-1-farosas@suse.de v5 resend: https://lore.kernel.org/r/20230213202927.28992-1-farosas@suse.de v5: https://lore.kernel.org/r/20230120184825.31626-1-farosas@suse.de v4: https://lore.kernel.org/r/20230119135424.5417-1-farosas@suse.de v3: https://lore.kernel.org/r/20230113140419.4013-1-farosas@suse.de v2: https://lore.kernel.org/r/20230109224232.11661-1-farosas@suse.de v1: https://lore.kernel.org/r/20230104215835.24692-1-farosas@suse.de Claudio Fontana (1): target/arm: move cpu_tcg to tcg/cpu32.c Fabiano Rosas (11): target/arm: Move cortex sysregs into a separate file target/arm: Remove dead code from cpu_max_set_sve_max_vq target/arm: Extract TCG -cpu max code into a function target/arm: Do not expose all -cpu max features to qtests target/arm: Move 64-bit TCG CPUs into tcg/ tests/qtest: Adjust and document query-cpu-model-expansion test for arm tests/qtest: Fix tests when no KVM or TCG are present tests/avocado: Pass parameters to migration test arm/Kconfig: Always select SEMIHOSTING when TCG is present arm/Kconfig: Do not build TCG-only boards on a KVM-only build tests/qtest: Restrict tpm-tis-i2c-test to CONFIG_TCG Philippe Mathieu-Daudé (1): gitlab-ci: Check building KVM-only aarch64 target .gitlab-ci.d/crossbuilds.yml | 11 + .../custom-runners/ubuntu-22.04-aarch64.yml | 4 - configs/devices/aarch64-softmmu/default.mak | 4 - configs/devices/arm-softmmu/default.mak | 39 - hw/arm/Kconfig | 43 +- hw/arm/virt.c | 6 +- target/arm/Kconfig | 7 + target/arm/cortex-regs.c | 69 ++ target/arm/cpregs.h | 6 + target/arm/cpu64.c | 702 +---------------- target/arm/internals.h | 10 +- target/arm/meson.build | 2 +- target/arm/{cpu_tcg.c => tcg/cpu32.c} | 72 +- target/arm/tcg/cpu64.c | 723 ++++++++++++++++++ target/arm/tcg/meson.build | 2 + tests/avocado/migration.py | 83 +- tests/qtest/arm-cpu-features.c | 20 +- tests/qtest/bios-tables-test.c | 11 +- tests/qtest/boot-serial-test.c | 5 + tests/qtest/meson.build | 3 +- tests/qtest/migration-test.c | 9 +- tests/qtest/pxe-test.c | 8 +- tests/qtest/vmgenid-test.c | 9 +- 23 files changed, 1016 insertions(+), 832 deletions(-) create mode 100644 target/arm/cortex-regs.c rename target/arm/{cpu_tcg.c => tcg/cpu32.c} (93%) create mode 100644 target/arm/tcg/cpu64.c