Message ID | 20210925145118.1361230-1-f4bug@amsat.org |
---|---|
Headers | show |
Series | accel: Move has_work() from CPUClass to AccelOpsClass | expand |
On 9/25/21 10:50 AM, Philippe Mathieu-Daudé wrote: > Philippe Mathieu-Daudé (40): > accel: Simplify qemu_init_vcpu() > hw/core: Restrict cpu_has_work() to sysemu > hw/core: Un-inline cpu_has_work() > hw/core: Move cpu_common_has_work() to cpu_has_work() > accel: Introduce AccelOpsClass::has_work() > accel/kvm: Implement AccelOpsClass::has_work() > accel/whpx: Implement AccelOpsClass::has_work() > accel/hvf: Implement AccelOpsClass::has_work() > accel/xen: Implement AccelOpsClass::has_work() > accel/hax: Implement AccelOpsClass::has_work() > accel/nvmm: Implement AccelOpsClass::has_work() > accel/qtest: Implement AccelOpsClass::has_work() > accel/tcg: Implement AccelOpsClass::has_work() > accel: Simplify cpu_has_work() > accel/tcg: Introduce TCGCPUOps::has_work() > target/arm: Explicit v7M cores use arm_cpu_has_work as > CPUClass:has_work > target/arm: Restrict has_work() handler to sysemu and TCG > target/alpha: Restrict has_work() handler to sysemu > target/avr: Restrict has_work() handler to sysemu > target/cris: Restrict has_work() handler to sysemu > target/hexagon: Remove unused has_work() handler > target/hppa: Restrict has_work() handler to sysemu > target/i386: Restrict has_work() handler to sysemu and TCG > target/m68k: Restrict has_work() handler to sysemu > target/microblaze: Restrict has_work() handler to sysemu > target/mips: Restrict has_work() handler to sysemu and TCG > target/nios2: Restrict has_work() handler to sysemu > target/openrisc: Restrict has_work() handler to sysemu > target/ppc: Introduce PowerPCCPUClass::has_work() > target/ppc: Restrict has_work() handlers to sysemu and TCG > target/riscv: Restrict has_work() handler to sysemu and TCG > target/rx: Restrict has_work() handler to sysemu > target/s390x: Restrict has_work() handler to sysemu and TCG > target/sh4: Restrict has_work() handler to sysemu > target/sparc: Remove pointless use of CONFIG_TCG definition > target/sparc: Restrict has_work() handler to sysemu > target/tricore: Restrict has_work() handler to sysemu > target/xtensa: Restrict has_work() handler to sysemu > accel/tcg: Remove CPUClass::has_work() > accel/tcg: Simplify tcg_cpu_has_work() $ make check GIT ui/keycodemapdb meson tests/fp/berkeley-testfloat-3 tests/fp/berkeley-softfloat-3 dtc capstone slirp [1/143] Generating qemu-version.h with a meson_exe.py custom command Running test qtest-aarch64/qom-test ** ERROR:../git-alt/accel/qtest/qtest.c:52:qtest_cpu_has_work: code should not be reached ERROR qtest-aarch64/qom-test - Bail out! ERROR:../git-alt/accel/qtest/qtest.c:52:qtest_cpu_has_work: code should not be reached Broken pipe r~
On 9/25/21 17:28, Richard Henderson wrote: > On 9/25/21 10:50 AM, Philippe Mathieu-Daudé wrote: >> Philippe Mathieu-Daudé (40): >> accel: Simplify qemu_init_vcpu() >> hw/core: Restrict cpu_has_work() to sysemu >> hw/core: Un-inline cpu_has_work() >> hw/core: Move cpu_common_has_work() to cpu_has_work() >> accel: Introduce AccelOpsClass::has_work() >> accel/kvm: Implement AccelOpsClass::has_work() >> accel/whpx: Implement AccelOpsClass::has_work() >> accel/hvf: Implement AccelOpsClass::has_work() >> accel/xen: Implement AccelOpsClass::has_work() >> accel/hax: Implement AccelOpsClass::has_work() >> accel/nvmm: Implement AccelOpsClass::has_work() >> accel/qtest: Implement AccelOpsClass::has_work() >> accel/tcg: Implement AccelOpsClass::has_work() >> accel: Simplify cpu_has_work() >> accel/tcg: Introduce TCGCPUOps::has_work() >> target/arm: Explicit v7M cores use arm_cpu_has_work as >> CPUClass:has_work >> target/arm: Restrict has_work() handler to sysemu and TCG >> target/alpha: Restrict has_work() handler to sysemu >> target/avr: Restrict has_work() handler to sysemu >> target/cris: Restrict has_work() handler to sysemu >> target/hexagon: Remove unused has_work() handler >> target/hppa: Restrict has_work() handler to sysemu >> target/i386: Restrict has_work() handler to sysemu and TCG >> target/m68k: Restrict has_work() handler to sysemu >> target/microblaze: Restrict has_work() handler to sysemu >> target/mips: Restrict has_work() handler to sysemu and TCG >> target/nios2: Restrict has_work() handler to sysemu >> target/openrisc: Restrict has_work() handler to sysemu >> target/ppc: Introduce PowerPCCPUClass::has_work() >> target/ppc: Restrict has_work() handlers to sysemu and TCG >> target/riscv: Restrict has_work() handler to sysemu and TCG >> target/rx: Restrict has_work() handler to sysemu >> target/s390x: Restrict has_work() handler to sysemu and TCG >> target/sh4: Restrict has_work() handler to sysemu >> target/sparc: Remove pointless use of CONFIG_TCG definition >> target/sparc: Restrict has_work() handler to sysemu >> target/tricore: Restrict has_work() handler to sysemu >> target/xtensa: Restrict has_work() handler to sysemu >> accel/tcg: Remove CPUClass::has_work() >> accel/tcg: Simplify tcg_cpu_has_work() > > $ make check > GIT ui/keycodemapdb meson tests/fp/berkeley-testfloat-3 > tests/fp/berkeley-softfloat-3 dtc capstone slirp > [1/143] Generating qemu-version.h with a meson_exe.py custom command > Running test qtest-aarch64/qom-test > ** > ERROR:../git-alt/accel/qtest/qtest.c:52:qtest_cpu_has_work: code should > not be reached > ERROR qtest-aarch64/qom-test - Bail out! > ERROR:../git-alt/accel/qtest/qtest.c:52:qtest_cpu_has_work: code should > not be reached > Broken pipe Yeah sorry I just realized 🤦♂️ Quick fix if you want to keep testing while allowing other to review: -- >8 -- diff --git a/accel/qtest/qtest.c b/accel/qtest/qtest.c index 903c39ec1bf..eb5a17cef18 100644 --- a/accel/qtest/qtest.c +++ b/accel/qtest/qtest.c @@ -51,3 +51,3 @@ static bool qtest_cpu_has_work(CPUState *cpu) { - g_assert_not_reached(); + return false; } ---