target/arm: Allow CONFIG_TCG=n builds
v11 cover target/arm: Allow CONFIG_TCG=n builds
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/[email protected]
v9:
https://lore.kernel.org/r/[email protected]
v8:
https://lore.kernel.org/r/[email protected]
v7 resend:
https://lore.kernel.org/r/[email protected]
v7:
https://lore.kernel.org/r/[email protected]
v6:
https://lore.kernel.org/r/[email protected]
v5 resend:
https://lore.kernel.org/r/[email protected]
v5:
https://lore.kernel.org/r/[email protected]
v4:
https://lore.kernel.org/r/[email protected]
v3:
https://lore.kernel.org/r/[email protected]
v2:
https://lore.kernel.org/r/[email protected]
v1:
https://lore.kernel.org/r/[email protected]
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.cSignature · 1 line
2.35.3
PATCH v11 1/13 target/arm: Move cortex sysregs into a separate file
The file cpu_tcg.c is about to be moved into the tcg/ directory, so move the register definitions into a new file.
Also move the function declaration to the more appropriate cpregs.h.
--- target/arm/cortex-regs.c | 69 ++++++++++++++++++++++++++++++++++++++++ target/arm/cpregs.h | 6 ++++ target/arm/cpu64.c | 1 + target/arm/cpu_tcg.c | 59 ---------------------------------- target/arm/internals.h | 6 ---- target/arm/meson.build | 1 + 6 files changed, 77 insertions(+), 65 deletions(-) create mode 100644 target/arm/cortex-regs.c
target/arm/cortex-regs.c new file +69 -0
@@ -0,0 +1,69 @@ +/* +* ARM Cortex-A registers +* +* This code is licensed under the GNU GPL v2 or later. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "cpu.h" +#include "cpregs.h" + + +static uint64_t l2ctlr_read (CPUARMState *env,const ARMCPRegInfo *ri) +{ +ARMCPU *cpu =env_archcpu (env); + +/* Number of cores is in [25:24]; otherwise we RAZ */ +return (cpu->core_count -1 ) <<24 ; +} + +static const ARMCPRegInfo cortex_a72_a57_a53_cp_reginfo[] = { + { .name ="L2CTLR_EL1" , .state =ARM_CP_STATE_AA64 , + .opc0 =3 , .opc1 =1 , .crn =11 , .crm =0 , .opc2 =2 , + .access =PL1_RW , .readfn = l2ctlr_read, + .writefn = arm_cp_write_ignore }, + { .name ="L2CTLR" , + .cp =15 , .opc1 =1 , .crn =9 , .crm =0 , .opc2 =2 , + .access =PL1_RW , .readfn = l2ctlr_read, + .writefn = arm_cp_write_ignore }, + { .name ="L2ECTLR_EL1" , .state =ARM_CP_STATE_AA64 , + .opc0 =3 , .opc1 =1 , .crn =11 , .crm =0 , .opc2 =3 , + .access =PL1_RW , .type =ARM_CP_CONST , .resetvalue =0 }, + { .name ="L2ECTLR" , + .cp =15 , .opc1 =1 , .crn =9 , .crm =0 , .opc2 =3 , + .access =PL1_RW , .type =ARM_CP_CONST , .resetvalue =0 }, + { .name ="L2ACTLR" , .state =ARM_CP_STATE_BOTH , + .opc0 =3 , .opc1 =1 , .crn =15 , .crm =0 , .opc2 =0 , + .access =PL1_RW , .type =ARM_CP_CONST , .resetvalue =0 }, + { .name ="CPUACTLR_EL1" , .state =ARM_CP_STATE_AA64 , + .opc0 =3 , .opc1 =1 , .crn =15 , .crm =2 , .opc2 =0 , + .access =PL1_RW , .type =ARM_CP_CONST , .resetvalue =0 }, + { .name ="CPUACTLR" , + .cp =15 , .opc1 =0 , .crm =15 , + .access =PL1_RW , .type =ARM_CP_CONST |ARM_CP_64BIT , .resetvalue =0 }, + { .name ="CPUECTLR_EL1" , .state =ARM_CP_STATE_AA64 , + .opc0 =3 , .opc1 =1 , .crn =15 , .crm =2 , .opc2 =1 , + .access =PL1_RW , .type =ARM_CP_CONST , .resetvalue =0 }, + { .name ="CPUECTLR" , + .cp =15 , .opc1 =1 , .crm =15 , + .access =PL1_RW , .type =ARM_CP_CONST |ARM_CP_64BIT , .resetvalue =0 }, + { .name ="CPUMERRSR_EL1" , .state =ARM_CP_STATE_AA64 , + .opc0 =3 , .opc1 =1 , .crn =15 , .crm =2 , .opc2 =2 , + .access =PL1_RW , .type =ARM_CP_CONST , .resetvalue =0 }, + { .name ="CPUMERRSR" , + .cp =15 , .opc1 =2 , .crm =15 , + .access =PL1_RW , .type =ARM_CP_CONST |ARM_CP_64BIT , .resetvalue =0 }, + { .name ="L2MERRSR_EL1" , .state =ARM_CP_STATE_AA64 , + .opc0 =3 , .opc1 =1 , .crn =15 , .crm =2 , .opc2 =3 , + .access =PL1_RW , .type =ARM_CP_CONST , .resetvalue =0 }, + { .name ="L2MERRSR" , + .cp =15 , .opc1 =3 , .crm =15 , + .access =PL1_RW , .type =ARM_CP_CONST |ARM_CP_64BIT , .resetvalue =0 }, +}; + +void define_cortex_a72_a57_a53_cp_reginfo (ARMCPU *cpu) +{ +define_arm_cp_regs (cpu, cortex_a72_a57_a53_cp_reginfo); +}
target/arm/cpregs.h +6 -0
@@ -1071,4 +1071,10 @@ static inline bool arm_cpreg_in_idspace(const ARMCPRegInfo *ri) ri->crn, ri->crm); } +#ifdef CONFIG_USER_ONLY +static inline void define_cortex_a72_a57_a53_cp_reginfo (ARMCPU *cpu) { } +#else +void define_cortex_a72_a57_a53_cp_reginfo (ARMCPU *cpu); +#endif +#endif /* TARGET_ARM_CPREGS_H */
target/arm/cpu64.c +1 -0
@@ -30,6 +30,7 @@#include "qapi/visitor.h" #include "hw/qdev-properties.h" #include "internals.h" +#include "cpregs.h" static void aarch64_a35_initfn (Object *obj) {
target/arm/cpu_tcg.c +0 -59
65 lines not on this page · raw message
target/arm/internals.h +0 -6
@@ -1376,12 +1376,6 @@ uint32_t arm_v7m_mrs_control(CPUARMState *env, uint32_t secure);uint32_t *arm_v7m_get_sp_ptr (CPUARMState *env,bool secure,bool threadmode,bool spsel); -#ifdef CONFIG_USER_ONLY -static inline void define_cortex_a72_a57_a53_cp_reginfo (ARMCPU *cpu) { } -#else -void define_cortex_a72_a57_a53_cp_reginfo (ARMCPU *cpu); -#endif -bool el_is_in_host (CPUARMState *env,int el);void aa32_max_features (ARMCPU *cpu);
target/arm/meson.build +1 -0
@@ -21,6 +21,7 @@ arm_softmmu_ss.add(files( 'arch_dump.c', 'arm-powerctl.c', 'arm-qmp-cmds.c', + 'cortex-regs.c', 'machine.c', 'ptw.c', ))
Signature · 1 line
2.35.3
Re: [PATCH v11 01/13] target/arm: Move cortex sysregs into a separate file
Quoted 9 lines · Fabiano Rosas
The file
cpu_tcg.cis about to be moved into the tcg/ directory, so move the register definitions into a new file.Also move the function declaration to the more appropriate
cpregs.h.Reviewed-by Richard Henderson <[email protected]>Signed-off-by Fabiano Rosas <[email protected]>--- target/arm/cortex-regs.c | 69 ++++++++++++++++++++++++++++++++++++++++
Worth renaming explicitly as cortex-a_regs.c?
Otherwise,
Quoted 7 lines
target/arm/cpregs.h | 6 ++++ target/arm/cpu64.c | 1 + target/arm/cpu_tcg.c | 59 ---------------------------------- target/arm/internals.h | 6 ---- target/arm/meson.build | 1 + 6 files changed, 77 insertions(+), 65 deletions(-)create mode 100644
target/arm/cortex-regs.c
PATCH v11 2/13 target/arm: Remove dead code from cpu_max_set_sve_max_vq
In reply to Fabiano RosasThe sve-max-vq property has been removed from the -cpu max used with KVM, so code under kvm_enabled in cpu_max_set_sve_max_vq is not reachable.
--- target/arm/cpu64.c | 6 ------ 1 file changed, 6 deletions(-)
target/arm/cpu64.c +0 -6
@@ -336,12 +336,6 @@ static void cpu_max_set_sve_max_vq(Object *obj, Visitor *v, const char *name,return ; } -if (kvm_enabled () && !kvm_arm_sve_supported ()) { -error_setg (errp,"cannot set sve-max-vq" ); -error_append_hint (errp,"SVE not supported by KVM on this host\n" ); -return ; - } -if (max_vq ==0 || max_vq >ARM_MAX_VQ ) {error_setg (errp,"unsupported SVE vector length" ); error_append_hint(errp, "Valid sve-max-vq in range [1-%d]\n",
Signature · 1 line
2.35.3
PATCH v11 3/13 target/arm: Extract TCG -cpu max code into a function
In reply to Fabiano RosasIntroduce aarch64_max_tcg_initfn that contains the TCG-only part of -cpu max configuration. We'll need that to be able to restrict this code to a TCG-only config in the next patches.
--- target/arm/cpu64.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-)
target/arm/cpu64.c +18 -14
@@ -1178,27 +1178,17 @@ static void aarch64_host_initfn(Object *obj)#endif } -/* -cpu max: if KVM is enabled, like -cpu host (best possible with this host); -* otherwise, a CPU with as many features enabled as our emulation supports. -* The version of '-cpu max' for qemu-system-arm is defined in cpu.c; +/* +* -cpu max: a CPU with as many features enabled as our emulation supports. +* The version of '-cpu max' for qemu-system-arm is defined in cpu_tcg.c; * this only needs to handle 64 bits. */ -static void aarch64_max_initfn (Object *obj) +static void aarch64_max_tcg_initfn (Object *obj) {ARMCPU *cpu =ARM_CPU (obj);uint64_t t;uint32_t u; -if (kvm_enabled () ||hvf_enabled ()) { -/* With KVM or HVF, '-cpu max' is identical to '-cpu host' */ -aarch64_host_initfn (obj); -return ; - } - -/* '-cpu max' for TCG: we currently do this as "A57 with extra things" */ - -aarch64_a57_initfn (obj); -/* * Reset MIDR so the guest doesn't mistake our 'max' CPU type for a real * one and try to apply errata workarounds or use impdef features we
@@ -1367,6 +1357,20 @@ static void aarch64_max_initfn(Object *obj)qdev_property_add_static (DEVICE (obj), &arm_cpu_lpa2_property); } +static void aarch64_max_initfn (Object *obj) +{ +if (kvm_enabled () ||hvf_enabled ()) { +/* With KVM or HVF, '-cpu max' is identical to '-cpu host' */ +aarch64_host_initfn (obj); +return ; + } + +/* '-cpu max' for TCG: we currently do this as "A57 with extra things" */ + +aarch64_a57_initfn (obj); +aarch64_max_tcg_initfn (obj); +} +static const ARMCPUInfo aarch64_cpus[] = { { .name ="cortex-a35" , .initfn = aarch64_a35_initfn }, { .name ="cortex-a57" , .initfn = aarch64_a57_initfn },
Signature · 1 line
2.35.3
PATCH v11 4/13 target/arm: Do not expose all -cpu max features to qtests
In reply to Fabiano RosasWe're about to move the TCG-only -cpu max configuration code under CONFIG_TCG. To be able to do that we need to make sure the qtests still have some cpu configured even when no other accelerator is available.
Delineate now what is used with TCG-only and what is also used with qtests to make the subsequent patches cleaner.
--- target/arm/cpu64.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
target/arm/cpu64.c +9 -3
@@ -25,6 +25,8 @@#include "qemu/module.h" #include "sysemu/kvm.h" #include "sysemu/hvf.h" +#include "sysemu/qtest.h" +#include "sysemu/tcg.h" #include "kvm_arm.h" #include "hvf_arm.h" #include "qapi/visitor.h"
@@ -1365,10 +1367,14 @@ static void aarch64_max_initfn(Object *obj)return ; } +if (tcg_enabled () ||qtest_enabled ()) { +aarch64_a57_initfn (obj); + } +/* '-cpu max' for TCG: we currently do this as "A57 with extra things" */ - -aarch64_a57_initfn (obj); -aarch64_max_tcg_initfn (obj); +if (tcg_enabled ()) { +aarch64_max_tcg_initfn (obj); + } }static const ARMCPUInfo aarch64_cpus[] = {
Signature · 1 line
2.35.3
Re: [PATCH v11 04/13] target/arm: Do not expose all -cpu max features to qtests
Quoted 5 lines · Fabiano Rosas
We're about to move the TCG-only -cpu max configuration code under
CONFIG_TCG. To be able to do that we need to make sure the qtests still have some cpu configured even when no other accelerator is available.
Quoted 7 lines
Delineate now what is used with TCG-only and what is also used with qtests to make the subsequent patches cleaner.
Signed-off-by Fabiano Rosas<[email protected]>--- target/arm/cpu64.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
r~
Re: [PATCH v11 04/13] target/arm: Do not expose all -cpu max features to qtests
In reply to Fabiano RosasQuoted 5 lines · Fabiano Rosas
We're about to move the TCG-only -cpu max configuration code under
CONFIG_TCG. To be able to do that we need to make sure the qtests still have some cpu configured even when no other accelerator is available.
Quoted 7 lines
Delineate now what is used with TCG-only and what is also used with qtests to make the subsequent patches cleaner.
Signed-off-by Fabiano Rosas <[email protected]>--- target/arm/cpu64.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
https://lore.kernel.org/qemu-devel/[email protected]/
https://lore.kernel.org/qemu-devel/[email protected]/
Re: [PATCH v11 04/13] target/arm: Do not expose all -cpu max features to qtests
Quoted 14 lines · Philippe Mathieu-Daudé
Quoted 5 lines · Fabiano Rosas
We're about to move the TCG-only -cpu max configuration code under
CONFIG_TCG. To be able to do that we need to make sure the qtests still have some cpu configured even when no other accelerator is available.Quoted 7 lines
Delineate now what is used with TCG-only and what is also used with qtests to make the subsequent patches cleaner.
Signed-off-by Fabiano Rosas <[email protected]>--- target/arm/cpu64.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
Quoted 7 lines
https://lore.kernel.org/qemu-devel/[email protected]/
Reviewed-by Philippe Mathieu-Daudé <[email protected]>https://lore.kernel.org/qemu-devel/[email protected]/
Reviewed-by Richard Henderson <[email protected]>
Ah, thank you! The 'b4 trailers' must have failed and I didn't notice.
PATCH v11 5/13 target/arm: Move 64-bit TCG CPUs into tcg/
In reply to Fabiano RosasMove the 64-bit CPUs that are TCG-only:
- cortex-a35
- cortex-a55
- cortex-a72
- cortex-a76
- a64fx
- neoverse-n1
Keep the CPUs that can be used with KVM:
- cortex-a57
- cortex-a53
- max
- host
--- hw/arm/virt.c | 6 +- target/arm/cpu64.c | 687 +---------------------------------- target/arm/internals.h | 4 + target/arm/tcg/cpu64.c | 723 +++++++++++++++++++++++++++++++++++++ target/arm/tcg/meson.build | 1 + 5 files changed, 735 insertions(+), 686 deletions(-) create mode 100644 target/arm/tcg/cpu64.c
hw/arm/virt.c +4 -2
@@ -208,14 +208,16 @@ static const char *valid_cpus[] = { ARM_CPU_TYPE_NAME("cortex-a7"), #endif ARM_CPU_TYPE_NAME("cortex-a15"), +#ifdef CONFIG_TCG ARM_CPU_TYPE_NAME("cortex-a35"), -ARM_CPU_TYPE_NAME ("cortex-a53" ), ARM_CPU_TYPE_NAME("cortex-a55"), -ARM_CPU_TYPE_NAME ("cortex-a57" ), ARM_CPU_TYPE_NAME("cortex-a72"), ARM_CPU_TYPE_NAME("cortex-a76"), ARM_CPU_TYPE_NAME("a64fx"), ARM_CPU_TYPE_NAME("neoverse-n1"), +#endif + ARM_CPU_TYPE_NAME("cortex-a53"), + ARM_CPU_TYPE_NAME("cortex-a57"), ARM_CPU_TYPE_NAME("host"), ARM_CPU_TYPE_NAME("max"), };
target/arm/cpu64.c +3 -684
743 lines not on this page · raw message
target/arm/internals.h +4 -0
@@ -1361,6 +1361,10 @@ void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp);void arm_cpu_sme_finalize (ARMCPU *cpu,Error **errp);void arm_cpu_pauth_finalize (ARMCPU *cpu,Error **errp);void arm_cpu_lpa2_finalize (ARMCPU *cpu,Error **errp); +void aarch64_max_tcg_initfn (Object *obj); +void aarch64_add_pauth_properties (Object *obj); +void aarch64_add_sve_properties (Object *obj); +void aarch64_add_sme_properties (Object *obj);#endif /* Read the CONTROL register as the MRS instruction would. */
target/arm/tcg/cpu64.c new file +723 -0
723 lines not on this page · raw message
target/arm/tcg/meson.build +1 -0
@@ -35,6 +35,7 @@ arm_ss.add(files( )) arm_ss.add(when: 'TARGET_AARCH64', if_true: files( + 'cpu64.c', 'translate-a64.c', 'translate-sve.c', 'translate-sme.c',
Signature · 1 line
2.35.3
Re: [PATCH v11 05/13] target/arm: Move 64-bit TCG CPUs into tcg/
Quoted 16 lines · Fabiano Rosas
Move the 64-bit CPUs that are TCG-only:
- cortex-a35
- cortex-a55
- cortex-a72
- cortex-a76
- a64fx
- neoverse-n1Keep the CPUs that can be used with KVM:
- cortex-a57
- cortex-a53
- max
- hostSigned-off-by Fabiano Rosas <[email protected]>Reviewed-by Richard Henderson <[email protected]>
Quoted 8 lines
--- hw/arm/virt.c | 6 +- target/arm/cpu64.c | 687 +---------------------------------- target/arm/internals.h | 4 + target/arm/tcg/cpu64.c | 723 +++++++++++++++++++++++++++++++++++++ target/arm/tcg/meson.build | 1 + 5 files changed, 735 insertions(+), 686 deletions(-)create mode 100644
target/arm/tcg/cpu64.c
PATCH v11 6/13 tests/qtest: Adjust and document query-cpu-model-expansion test for arm
In reply to Fabiano RosasWe're about to move the 32-bit CPUs under CONFIG_TCG, so adjust the query-cpu-model-expansion test to check against the cortex-a7, which is already under CONFIG_TCG. That allows the next patch to contain only code movement.
While here add comments clarifying what we're testing.
--- tests/qtest/arm-cpu-features.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
tests/qtest/arm-cpu-features.c +17 -3
@@ -506,9 +506,23 @@ static void test_query_cpu_model_expansion_kvm(const void *data)QDict *resp;char *error; -assert_error (qts,"cortex-a15" , -"We cannot guarantee the CPU type 'cortex-a15' works " -"with KVM on this host" ,NULL ); +/* +* When using KVM, only the 'host' and 'max' CPU models are +* supported. Test that we're emitting a suitable error for +* unsupported CPU models. +*/ +if (qtest_has_accel ("tcg" )) { +assert_error (qts,"cortex-a7" , +"We cannot guarantee the CPU type 'cortex-a7' works " +"with KVM on this host" ,NULL ); + }else { +/* +* With a KVM-only build the 32-bit CPUs are not present. +*/ +assert_error (qts,"cortex-a7" , +"The CPU type 'cortex-a7' is not a " +"recognized ARM CPU type" ,NULL ); + }assert_has_feature_enabled (qts,"host" ,"aarch64" );
Signature · 1 line
2.35.3
Re: [PATCH v11 06/13] tests/qtest: Adjust and document query-cpu-model-expansion test for arm
Quoted 5 lines · Fabiano Rosas
We're about to move the 32-bit CPUs under
CONFIG_TCG, so adjust the query-cpu-model-expansion test to check against the cortex-a7, which is already underCONFIG_TCG. That allows the next patch to contain only code movement.
Quoted 7 lines
While here add comments clarifying what we're testing.
Signed-off-by Fabiano Rosas <[email protected]>Suggested-by Philippe Mathieu-Daudé <[email protected]>--- tests/qtest/arm-cpu-features.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
Re: [PATCH v11 06/13] tests/qtest: Adjust and document query-cpu-model-expansion test for arm
In reply to Fabiano RosasQuoted 5 lines · Fabiano Rosas
We're about to move the 32-bit CPUs under
CONFIG_TCG, so adjust the query-cpu-model-expansion test to check against the cortex-a7, which is already underCONFIG_TCG. That allows the next patch to contain only code movement.
Quoted 7 lines
While here add comments clarifying what we're testing.
Signed-off-by Fabiano Rosas<[email protected]>Suggested-by Philippe Mathieu-Daudé<[email protected]>--- tests/qtest/arm-cpu-features.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
I don't see why you're changing the cpu model here. Neither cpu will work, of course, but why change?
r~
Re: [PATCH v11 06/13] tests/qtest: Adjust and document query-cpu-model-expansion test for arm
Quoted 8 lines · Richard Henderson
Quoted 7 lines · Fabiano Rosas
We're about to move the 32-bit CPUs under
CONFIG_TCG, so adjust the query-cpu-model-expansion test to check against the cortex-a7, which is already underCONFIG_TCG. That allows the next patch to contain only code movement.While here add comments clarifying what we're testing.
Quoted 9 lines
Quoted 5 lines
Signed-off-by Fabiano Rosas<[email protected]>Suggested-by Philippe Mathieu-Daudé<[email protected]>--- tests/qtest/arm-cpu-features.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)I don't see why you're changing the cpu model here. Neither cpu will work, of course, but why change?
Because there's already a patch in master that puts the cortex-a7 under CONFIG_TCG, so I can have the whole if/else in this patch.
If I keep the cortex-a15, this change needs to go into the next patch ("move cpu_tcg to tcg/cpu32.c") which moves the rest of the 32bit cpus, which was supposed to be only code movement.
Re: [PATCH v11 06/13] tests/qtest: Adjust and document query-cpu-model-expansion test for arm
Quoted 20 lines · Fabiano Rosas
Quoted 8 lines · Richard Henderson
Quoted 7 lines · Fabiano Rosas
We're about to move the 32-bit CPUs under
CONFIG_TCG, so adjust the query-cpu-model-expansion test to check against the cortex-a7, which is already underCONFIG_TCG. That allows the next patch to contain only code movement.While here add comments clarifying what we're testing.
Quoted 9 lines
Quoted 5 lines
Signed-off-by Fabiano Rosas<[email protected]>Suggested-by Philippe Mathieu-Daudé<[email protected]>--- tests/qtest/arm-cpu-features.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)I don't see why you're changing the cpu model here. Neither cpu will work, of course, but why change?
Quoted 6 lines
Because there's already a patch in master that puts the cortex-a7 under
CONFIG_TCG, so I can have the whole if/else in this patch.If I keep the cortex-a15, this change needs to go into the next patch ("move
cpu_tcgtotcg/cpu32.c") which moves the rest of the 32bit cpus, which was supposed to be only code movement.
Well, I still think the change to a7 is wrong.
If the two patches need to be merged to break bisection, then so be it -- just mention that fact in the commit message.
Peter, do you agree?
r~
Re: [PATCH v11 06/13] tests/qtest: Adjust and document query-cpu-model-expansion test for arm
Quoted 24 lines · Richard Henderson
Quoted 23 lines · Fabiano Rosas
Quoted 8 lines · Richard Henderson
Quoted 7 lines · Fabiano Rosas
We're about to move the 32-bit CPUs under
CONFIG_TCG, so adjust the query-cpu-model-expansion test to check against the cortex-a7, which is already underCONFIG_TCG. That allows the next patch to contain only code movement.While here add comments clarifying what we're testing.
Quoted 9 lines
Quoted 5 lines
Signed-off-by Fabiano Rosas<[email protected]>Suggested-by Philippe Mathieu-Daudé<[email protected]>--- tests/qtest/arm-cpu-features.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)I don't see why you're changing the cpu model here. Neither cpu will work, of course, but why change?
Because there's already a patch in master that puts the cortex-a7 under
CONFIG_TCG, so I can have the whole if/else in this patch.
Quoted 8 lines
Quoted 3 lines
If I keep the cortex-a15, this change needs to go into the next patch ("move
cpu_tcgtotcg/cpu32.c") which moves the rest of the 32bit cpus, which was supposed to be only code movement.Well, I still think the change to a7 is wrong.
If the two patches need to be merged to break bisection, then so be it -- just mention that fact in the commit message.
I don't get why it would be wrong. The test just needs any cpu model that triggers the message at qmp_query_cpu_model_expansion.
Re: [PATCH v11 06/13] tests/qtest: Adjust and document query-cpu-model-expansion test for arm
In reply to Richard HendersonQuoted 29 lines · Richard Henderson
Quoted 20 lines · Fabiano Rosas
Quoted 8 lines · Richard Henderson
Quoted 7 lines · Fabiano Rosas
We're about to move the 32-bit CPUs under
CONFIG_TCG, so adjust the query-cpu-model-expansion test to check against the cortex-a7, which is already underCONFIG_TCG. That allows the next patch to contain only code movement.While here add comments clarifying what we're testing.
Quoted 9 lines
Quoted 5 lines
Signed-off-by Fabiano Rosas<[email protected]>Suggested-by Philippe Mathieu-Daudé<[email protected]>--- tests/qtest/arm-cpu-features.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)I don't see why you're changing the cpu model here. Neither cpu will work, of course, but why change?
Quoted 6 lines
Because there's already a patch in master that puts the cortex-a7 under
CONFIG_TCG, so I can have the whole if/else in this patch.If I keep the cortex-a15, this change needs to go into the next patch ("move
cpu_tcgtotcg/cpu32.c") which moves the rest of the 32bit cpus, which was supposed to be only code movement.
Quoted 5 lines
Well, I still think the change to a7 is wrong.
If the two patches need to be merged to break bisection, then so be it -- just mention that fact in the commit message.Peter, do you agree?
I see your point, but on the other hand this is only test code, and the situation it's checking is a rather uninteresting one anyway. So given that this series is already on v11 and it's an awkward one to have to keep rebasing, I'd rather take it as-is than ask for a reroll.
thanks
-- PMM
PATCH v11 7/13 target/arm: move cpu_tcg to tcg/cpu32.c
In reply to Fabiano RosasFrom: Claudio Fontana <[email protected]>
move the module containing cpu models definitions for 32bit TCG-only CPUs to tcg/ and rename it for clarity.
---
hw/arm/virt.c | 2 --
target/arm/meson.build | 1 -
target/arm/{cpu_tcg.c => tcg/cpu32.c} | 13 +++----------
target/arm/tcg/cpu64.c | 2 +-
target/arm/tcg/meson.build | 1 +
5 files changed, 5 insertions(+), 14 deletions(-)
rename target/arm/{cpu_tcg.c => tcg/cpu32.c} (99%)hw/arm/virt.c +0 -2
@@ -206,9 +206,7 @@ static const int a15irqmap[] = {static const char *valid_cpus[] = { #ifdef CONFIG_TCGARM_CPU_TYPE_NAME ("cortex-a7" ), -#endifARM_CPU_TYPE_NAME ("cortex-a15" ), -#ifdef CONFIG_TCGARM_CPU_TYPE_NAME ("cortex-a35" ),ARM_CPU_TYPE_NAME ("cortex-a55" ), ARM_CPU_TYPE_NAME("cortex-a72"),
target/arm/meson.build +0 -1
@@ -5,7 +5,6 @@ arm_ss.add(files( 'gdbstub.c', 'helper.c', 'vfp_helper.c', - 'cpu_tcg.c', )) arm_ss.add(zlib)
target/arm/tcg/cpu32.c renamed from target/arm/cpu_tcg.c +3 -10
@@ -1,5 +1,5 @@/* -* QEMU ARM TCG CPUs. +* QEMU ARM TCG-only CPUs. * * Copyright (c) 2012 SUSE LINUX Products GmbH *
@@ -10,9 +10,7 @@#include "qemu/osdep.h" #include "cpu.h" -#ifdef CONFIG_TCG #include "hw/core/tcg-cpu-ops.h" -#endif /* CONFIG_TCG */ #include "internals.h" #include "target/arm/idau.h" #if !defined(CONFIG_USER_ONLY )
@@ -96,7 +94,7 @@ void aa32_max_features(ARMCPU *cpu)/* CPU models. These are not needed for the AArch64 linux-user build. */ #if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) -#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG) +#if !defined(CONFIG_USER_ONLY) static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { CPUClass *cc = CPU_GET_CLASS(cs);
@@ -120,7 +118,7 @@ static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int interrupt_request) }return ret; } -#endif /* !CONFIG_USER_ONLY && CONFIG_TCG */ +#endif /* !CONFIG_USER_ONLY */ static void arm926_initfn (Object *obj) {
@@ -1014,7 +1012,6 @@ static void pxa270c5_initfn(Object *obj) cpu->reset_sctlr =0x00000078 ; } -#ifdef CONFIG_TCG static const struct TCGCPUOps arm_v7m_tcg_ops = { .initialize = arm_translate_init, .synchronize_from_tb = arm_cpu_synchronize_from_tb,
@@ -1035,7 +1032,6 @@ static const struct TCGCPUOps arm_v7m_tcg_ops = { .debug_check_breakpoint = arm_debug_check_breakpoint,#endif /* !CONFIG_USER_ONLY */ }; -#endif /* CONFIG_TCG */ static void arm_v7m_class_init (ObjectClass *oc,void *data) {
@@ -1043,10 +1039,7 @@ static void arm_v7m_class_init(ObjectClass *oc, void *data)CPUClass *cc =CPU_CLASS (oc); acc->info = data; -#ifdef CONFIG_TCG cc->tcg_ops = &arm_v7m_tcg_ops; -#endif /* CONFIG_TCG */ - cc->gdb_core_xml_file ="arm-m-profile.xml" ; }
target/arm/tcg/cpu64.c +1 -1
@@ -525,7 +525,7 @@ static void aarch64_neoverse_n1_initfn(Object *obj)/* * -cpu max: a CPU with as many features enabled as our emulation supports. -* The version of '-cpu max' for qemu-system-arm is defined in cpu_tcg.c; +* The version of '-cpu max' for qemu-system-arm is defined in cpu32.c; * this only needs to handle 64 bits. */ void aarch64_max_tcg_initfn (Object *obj)
target/arm/tcg/meson.build +1 -0
@@ -18,6 +18,7 @@ gen = [ arm_ss.add(gen) arm_ss.add(files( + 'cpu32.c', 'translate.c', 'translate-m-nocp.c', 'translate-mve.c',
Signature · 1 line
2.35.3
Re: [PATCH v11 07/13] target/arm: move cpu_tcg to tcg/cpu32.c
Quoted 9 lines · Fabiano Rosas
From: Claudio Fontana <[email protected]>
move the module containing cpu models definitions for 32bit TCG-only CPUs to tcg/ and rename it for clarity.
Signed-off-by Claudio Fontana <[email protected]>Signed-off-by Fabiano Rosas <[email protected]>Reviewed-by Richard Henderson <[email protected]>Acked-by Thomas Huth <[email protected]>
Quoted 8 lines
--- hw/arm/virt.c | 2 -- target/arm/meson.build | 1 - target/arm/{cpu_tcg.c => tcg/cpu32.c} | 13 +++---------- target/arm/tcg/cpu64.c | 2 +- target/arm/tcg/meson.build | 1 + 5 files changed, 5 insertions(+), 14 deletions(-)rename
target/arm/{cpu_tcg.c=>tcg/cpu32.c} (99%)
I think it took almost 3 years to get this in... :)
PATCH v11 8/13 tests/qtest: Fix tests when no KVM or TCG are present
In reply to Fabiano RosasIt is possible to have a build with both TCG and KVM disabled due to Xen requiring the i386 and x86_64 binaries to be present in an aarch64 host.
If we build with --disable-tcg on the aarch64 host, we will end-up with a QEMU binary (x86) that does not support TCG nor KVM.
Skip tests that crash or hang in the above scenario. Do not include any test cases if TCG and KVM are missing.
Make sure that calls to qtest_has_accel are placed after g_test_init in similar fashion to commit ae4b01b349 ("tests: Ensure TAP version is printed before other messages") to avoid TAP parsing errors.
--- tests/qtest/bios-tables-test.c | 11 +++++++++-- tests/qtest/boot-serial-test.c | 5 +++++ tests/qtest/migration-test.c | 9 ++++++++- tests/qtest/pxe-test.c | 8 +++++++- tests/qtest/vmgenid-test.c | 9 +++++++-- 5 files changed, 36 insertions(+), 6 deletions(-)
tests/qtest/bios-tables-test.c +9 -2
@@ -2045,8 +2045,7 @@ static void test_acpi_virt_oem_fields(void)int main (int argc,char *argv[]) {const char *arch =qtest_get_arch (); -const bool has_kvm =qtest_has_accel ("kvm" ); -const bool has_tcg =qtest_has_accel ("tcg" ); +bool has_kvm, has_tcg;char *v_env =getenv ("V" );int ret;
@@ -2056,6 +2055,14 @@ int main(int argc, char *argv[])g_test_init (&argc, &argv,NULL ); + has_kvm =qtest_has_accel ("kvm" ); + has_tcg =qtest_has_accel ("tcg" ); + +if (!has_tcg && !has_kvm) { +g_test_skip ("No KVM or TCG accelerator available" ); +return 0 ; + } +if (strcmp (arch,"i386" ) ==0 ||strcmp (arch,"x86_64" ) ==0 ) { ret =boot_sector_init (disk);if (ret) {
tests/qtest/boot-serial-test.c +5 -0
@@ -287,6 +287,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 ; + } +for (i =0 ; tests[i].arch !=NULL ; i++) {if (g_str_equal (arch, tests[i].arch) &&qtest_has_machine (tests[i].machine)) {
tests/qtest/migration-test.c +8 -1
@@ -2477,7 +2477,7 @@ static bool kvm_dirty_ring_supported(void)int main (int argc,char **argv) { -bool has_kvm; +bool has_kvm, has_tcg;bool has_uffd;const char *arch;g_autoptr (GError) err =NULL ;
@@ -2486,6 +2486,13 @@ int main(int argc, char **argv)g_test_init (&argc, &argv,NULL ); has_kvm =qtest_has_accel ("kvm" ); + has_tcg =qtest_has_accel ("tcg" ); + +if (!has_tcg && !has_kvm) { +g_test_skip ("No KVM or TCG accelerator available" ); +return 0 ; + } + has_uffd =ufd_version_check (); arch =qtest_get_arch ();
tests/qtest/pxe-test.c +7 -1
@@ -131,11 +131,17 @@ int main(int argc, char *argv[])int ret;const char *arch =qtest_get_arch (); +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 ; + } + ret =boot_sector_init (disk);if (ret)return ret; -g_test_init (&argc, &argv,NULL );if (strcmp (arch,"i386" ) ==0 ||strcmp (arch,"x86_64" ) ==0 ) {test_batch (x86_tests, false);
tests/qtest/vmgenid-test.c +7 -2
@@ -165,13 +165,18 @@ int main(int argc, char **argv) {int ret; +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 ; + } + ret =boot_sector_init (disk);if (ret) {return ret; } -g_test_init (&argc, &argv,NULL ); -qtest_add_func ("/vmgenid/vmgenid/set-guid" , vmgenid_set_guid_test); qtest_add_func("/vmgenid/vmgenid/set-guid-auto",
Signature · 1 line
2.35.3
Re: [PATCH v11 08/13] tests/qtest: Fix tests when no KVM or TCG are present
Quoted 17 lines · Fabiano Rosas
It is possible to have a build with both TCG and KVM disabled due to Xen requiring the i386 and
x86_64binaries to be present in an aarch64 host.If we build with --disable-tcg on the aarch64 host, we will end-up with a QEMU binary (x86) that does not support TCG nor KVM.
Skip tests that crash or hang in the above scenario. Do not include any test cases if TCG and KVM are missing.
Make sure that calls to
qtest_has_accelare placed afterg_test_initin similar fashion to commitae4b01b349("tests: Ensure TAP version is printed before other messages") to avoid TAP parsing errors.Reviewed-by Juan Quintela<[email protected]>Reviewed-by Thomas Huth<[email protected]>Signed-off-by Fabiano Rosas<[email protected]>
Quoted 7 lines
--- tests/qtest/bios-tables-test.c | 11 +++++++++-- tests/qtest/boot-serial-test.c | 5 +++++ tests/qtest/migration-test.c | 9 ++++++++- tests/qtest/pxe-test.c | 8 +++++++- tests/qtest/vmgenid-test.c | 9 +++++++-- 5 files changed, 36 insertions(+), 6 deletions(-)
r~
Re: [PATCH v11 08/13] tests/qtest: Fix tests when no KVM or TCG are present
In reply to Fabiano RosasQuoted 10 lines · Fabiano Rosas
It is possible to have a build with both TCG and KVM disabled due to Xen requiring the i386 and
x86_64binaries to be present in an aarch64 host.If we build with --disable-tcg on the aarch64 host, we will end-up with a QEMU binary (x86) that does not support TCG nor KVM.
Skip tests that crash or hang in the above scenario. Do not include any test cases if TCG and KVM are missing.
Quoted 7 lines
Make sure that calls to
qtest_has_accelare placed afterg_test_initin similar fashion to commitae4b01b349("tests: Ensure TAP version is printed before other messages") to avoid TAP parsing errors.Reviewed-by Juan Quintela <[email protected]>Reviewed-by Thomas Huth <[email protected]>Signed-off-by Fabiano Rosas <[email protected]>
makes sense to me
Quoted 130 lines
--- tests/qtest/bios-tables-test.c | 11 +++++++++-- tests/qtest/boot-serial-test.c | 5 +++++ tests/qtest/migration-test.c | 9 ++++++++- tests/qtest/pxe-test.c | 8 +++++++- tests/qtest/vmgenid-test.c | 9 +++++++-- 5 files changed, 36 insertions(+), 6 deletions(-)tests/qtest/bios-tables-test.c +9
-2@@ -2045,8 +2045,7 @@ static void test_acpi_virt_oem_fields(void)int main (int argc,char *argv[]) {const char *arch =qtest_get_arch (); -const bool has_kvm =qtest_has_accel ("kvm" ); -const bool has_tcg =qtest_has_accel ("tcg" ); +bool has_kvm, has_tcg;char *v_env =getenv ("V" );int ret;@@ -2056,6 +2055,14 @@ int main(int argc, char *argv[])g_test_init (&argc, &argv,NULL ); + has_kvm =qtest_has_accel ("kvm" ); + has_tcg =qtest_has_accel ("tcg" ); + +if (!has_tcg && !has_kvm) { +g_test_skip ("No KVM or TCG accelerator available" ); +return 0 ; + } +if (strcmp (arch,"i386" ) ==0 ||strcmp (arch,"x86_64" ) ==0 ) { ret =boot_sector_init (disk);if (ret) {tests/qtest/boot-serial-test.c +5
-0@@ -287,6 +287,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 ; + } +for (i =0 ; tests[i].arch !=NULL ; i++) {if (g_str_equal (arch, tests[i].arch) &&qtest_has_machine (tests[i].machine)) {tests/qtest/migration-test.c +8
-1@@ -2477,7 +2477,7 @@ static bool kvm_dirty_ring_supported(void)int main (int argc,char **argv) { -bool has_kvm; +bool has_kvm, has_tcg;bool has_uffd;const char *arch;g_autoptr (GError) err =NULL ;@@ -2486,6 +2486,13 @@ int main(int argc, char **argv)g_test_init (&argc, &argv,NULL ); has_kvm =qtest_has_accel ("kvm" ); + has_tcg =qtest_has_accel ("tcg" ); + +if (!has_tcg && !has_kvm) { +g_test_skip ("No KVM or TCG accelerator available" ); +return 0 ; + } + has_uffd =ufd_version_check (); arch =qtest_get_arch ();tests/qtest/pxe-test.c +7
-1@@ -131,11 +131,17 @@ int main(int argc, char *argv[])int ret;const char *arch =qtest_get_arch (); +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 ; + } + ret =boot_sector_init (disk);if (ret)return ret; -g_test_init (&argc, &argv,NULL );if (strcmp (arch,"i386" ) ==0 ||strcmp (arch,"x86_64" ) ==0 ) {test_batch (x86_tests, false);tests/qtest/vmgenid-test.c +7
-2@@ -165,13 +165,18 @@ int main(int argc, char **argv) {int ret; +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 ; + } + ret =boot_sector_init (disk);if (ret) {return ret; } -g_test_init (&argc, &argv,NULL ); -qtest_add_func ("/vmgenid/vmgenid/set-guid" , vmgenid_set_guid_test); qtest_add_func("/vmgenid/vmgenid/set-guid-auto",Signature · 1 line
2.35.3
Re: [PATCH v11 08/13] tests/qtest: Fix tests when no KVM or TCG are present
In reply to Fabiano RosasQuoted 17 lines · Fabiano Rosas
It is possible to have a build with both TCG and KVM disabled due to Xen requiring the i386 and
x86_64binaries to be present in an aarch64 host.If we build with --disable-tcg on the aarch64 host, we will end-up with a QEMU binary (x86) that does not support TCG nor KVM.
Skip tests that crash or hang in the above scenario. Do not include any test cases if TCG and KVM are missing.
Make sure that calls to
qtest_has_accelare placed afterg_test_initin similar fashion to commitae4b01b349("tests: Ensure TAP version is printed before other messages") to avoid TAP parsing errors.Reviewed-by Juan Quintela <[email protected]>Reviewed-by Thomas Huth <[email protected]>Signed-off-by Fabiano Rosas <[email protected]>
Quoted 7 lines
--- tests/qtest/bios-tables-test.c | 11 +++++++++-- tests/qtest/boot-serial-test.c | 5 +++++ tests/qtest/migration-test.c | 9 ++++++++- tests/qtest/pxe-test.c | 8 +++++++- tests/qtest/vmgenid-test.c | 9 +++++++-- 5 files changed, 36 insertions(+), 6 deletions(-)
PATCH v11 9/13 tests/avocado: Pass parameters to migration test
In reply to Fabiano RosasThe migration tests are currently broken for an aarch64 host because the tests pass no 'machine' and 'cpu' options on the QEMU command line.
Add a separate class to each architecture so that we can specify 'machine' and 'cpu' options instead of relying on defaults.
Add a skip decorator to keep the current behavior of only running migration tests when the qemu target matches the host architecture.
--- tests/avocado/migration.py | 83 +++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 5 deletions(-)
tests/avocado/migration.py +78 -5
@@ -11,6 +11,8 @@ import tempfile +import os + from avocado_qemu import QemuSystemTest from avocado import skipUnless
@@ -19,7 +21,7 @@ from avocado.utils.path import find_command -class Migration(QemuSystemTest): +class MigrationTest(QemuSystemTest): """ :avocado: tags=migration """
@@ -62,20 +64,91 @@ def _get_free_port(self): self.cancel('Failed to find a free port') return port - - def test_migration_with_tcp_localhost(self): + def migration_with_tcp_localhost(self): dest_uri = 'tcp:localhost:%u' % self._get_free_port() self.do_migrate(dest_uri) - def test_migration_with_unix(self): + def migration_with_unix(self): with tempfile.TemporaryDirectory(prefix='socket_') as socket_path: dest_uri = 'unix:%s/qemu-test.sock' % socket_path self.do_migrate(dest_uri) @skipUnless(find_command('nc', default=False), "'nc' command not found") - def test_migration_with_exec(self): + def migration_with_exec(self): """The test works for both netcat-traditional and netcat-openbsd packages.""" free_port = self._get_free_port() dest_uri = 'exec:nc -l localhost %u' % free_port src_uri = 'exec:nc localhost %u' % free_port self.do_migrate(dest_uri, src_uri) + + +@skipUnless('aarch64' in os.uname()[4], "host != target") +class Aarch64(MigrationTest): + """ + :avocado: tags=arch:aarch64 + :avocado: tags=machine:virt + :avocado: tags=cpu:max + """ + + def test_migration_with_tcp_localhost(self): + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.migration_with_unix() + + def test_migration_with_exec(self): + self.migration_with_exec() + + +@skipUnless('x86_64' in os.uname()[4], "host != target") +class X86_64(MigrationTest): + """ + :avocado: tags=arch:x86_64 + :avocado: tags=machine:pc + :avocado: tags=cpu:qemu64 + """ + + def test_migration_with_tcp_localhost(self): + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.migration_with_unix() + + def test_migration_with_exec(self): + self.migration_with_exec() + + +@skipUnless('ppc64le' in os.uname()[4], "host != target") +class PPC64(MigrationTest): + """ + :avocado: tags=arch:ppc64 + :avocado: tags=machine:pseries + :avocado: tags=cpu:power9_v2.0 + """ + + def test_migration_with_tcp_localhost(self): + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.migration_with_unix() + + def test_migration_with_exec(self): + self.migration_with_exec() + + +@skipUnless('s390x' in os.uname()[4], "host != target") +class S390X(MigrationTest): + """ + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + :avocado: tags=cpu:qemu + """ + + def test_migration_with_tcp_localhost(self): + self.migration_with_tcp_localhost() + + def test_migration_with_unix(self): + self.migration_with_unix() + + def test_migration_with_exec(self): + self.migration_with_exec()
Signature · 1 line
2.35.3
PATCH v11 10/13 arm/Kconfig: Always select SEMIHOSTING when TCG is present
In reply to Fabiano RosasWe are about to enable the build without TCG, so CONFIG_SEMIHOSTING and CONFIG_ARM_COMPATIBLE_SEMIHOSTING cannot be unconditionally set in default.mak anymore. So reflect the change in a Kconfig.
Instead of using semihosting/Kconfig, use a target-specific file, so that the change doesn't affect other architectures which might implement semihosting in a way compatible with KVM.
The selection from ARM_v7M needs to be removed to avoid a cycle during parsing.
--- configs/devices/arm-softmmu/default.mak | 2 -- hw/arm/Kconfig | 1 - target/arm/Kconfig | 7 +++++++ 3 files changed, 7 insertions(+), 3 deletions(-)
configs/devices/arm-softmmu/default.mak +0 -2
@@ -40,6 +40,4 @@ CONFIG_MICROBIT=y CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y -CONFIG_SEMIHOSTING=y -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y CONFIG_ALLWINNER_H3=y
hw/arm/Kconfig +0 -1
@@ -317,7 +317,6 @@ config ARM_V7M # currently v7M must be included in a TCG build due to translate.c default y if TCG && (ARM || AARCH64) select PTIMER - select ARM_COMPATIBLE_SEMIHOSTING config ALLWINNER_A10 bool
target/arm/Kconfig +7 -0
@@ -4,3 +4,10 @@ config ARM config AARCH64 bool select ARM + +# This config exists just so we can make SEMIHOSTING default when TCG +# is selected without also changing it for other architectures. +config ARM_SEMIHOSTING + bool + default y if TCG && ARM + select ARM_COMPATIBLE_SEMIHOSTING
Signature · 1 line
2.35.3
PATCH v11 11/13 arm/Kconfig: Do not build TCG-only boards on a KVM-only build
In reply to Fabiano RosasMove all the CONFIG_FOO=y from default.mak into "default y if TCG" statements in Kconfig. That way they won't be selected when CONFIG_TCG=n.
I'm leaving CONFIG_ARM_VIRT in default.mak because it allows us to keep the two default.mak files not empty and keep aarch64-default.mak including arm-default.mak. That way we don't surprise anyone that's used to altering these files.
With this change we can start building with --disable-tcg.
--- configs/devices/aarch64-softmmu/default.mak | 4 -- configs/devices/arm-softmmu/default.mak | 37 ------------------ hw/arm/Kconfig | 42 ++++++++++++++++++++- 3 files changed, 41 insertions(+), 42 deletions(-)
configs/devices/aarch64-softmmu/default.mak +0 -4
@@ -2,7 +2,3 @@ # We support all the 32 bit boards so need all their config include ../arm-softmmu/default.mak - -CONFIG_XLNX_ZYNQMP_ARM=y -CONFIG_XLNX_VERSAL=y -CONFIG_SBSA_REF=y
configs/devices/arm-softmmu/default.mak +0 -37
@@ -4,40 +4,3 @@ # CONFIG_TEST_DEVICES=n CONFIG_ARM_VIRT=y -CONFIG_CUBIEBOARD=y -CONFIG_EXYNOS4=y -CONFIG_HIGHBANK=y -CONFIG_INTEGRATOR=y -CONFIG_FSL_IMX31=y -CONFIG_MUSICPAL=y -CONFIG_MUSCA=y -CONFIG_CHEETAH=y -CONFIG_SX1=y -CONFIG_NSERIES=y -CONFIG_STELLARIS=y -CONFIG_STM32VLDISCOVERY=y -CONFIG_REALVIEW=y -CONFIG_VERSATILE=y -CONFIG_VEXPRESS=y -CONFIG_ZYNQ=y -CONFIG_MAINSTONE=y -CONFIG_GUMSTIX=y -CONFIG_SPITZ=y -CONFIG_TOSA=y -CONFIG_Z2=y -CONFIG_NPCM7XX=y -CONFIG_COLLIE=y -CONFIG_ASPEED_SOC=y -CONFIG_NETDUINO2=y -CONFIG_NETDUINOPLUS2=y -CONFIG_OLIMEX_STM32_H405=y -CONFIG_MPS2=y -CONFIG_RASPI=y -CONFIG_DIGIC=y -CONFIG_SABRELITE=y -CONFIG_EMCRAFT_SF2=y -CONFIG_MICROBIT=y -CONFIG_FSL_IMX25=y -CONFIG_FSL_IMX7=y -CONFIG_FSL_IMX6UL=y -CONFIG_ALLWINNER_H3=y
hw/arm/Kconfig +41 -1
275 lines not on this page · raw message
Signature · 1 line
2.35.3
PATCH v11 12/13 tests/qtest: Restrict tpm-tis-i2c-test to CONFIG_TCG
In reply to Fabiano RosasThe test set -accel tcg, so restrict it to when TCG is present.
--- tests/qtest/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tests/qtest/meson.build +2 -1
@@ -213,7 +213,8 @@ qtests_aarch64 = \ ['tpm-tis-device-test', 'tpm-tis-device-swtpm-test'] : []) + \ (config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \ (config_all_devices.has_key('CONFIG_RASPI') ? ['bcm2835-dma-test'] : []) + \ - (config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \ + (config_all.has_key('CONFIG_TCG') and \ + config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \ ['arm-cpu-features', 'numa-test', 'boot-serial-test',
Signature · 1 line
2.35.3
Re: [PATCH v11 12/13] tests/qtest: Restrict tpm-tis-i2c-test to CONFIG_TCG
Quoted 12 lines · Fabiano Rosas
The test set -accel tcg, so restrict it to when TCG is present.
Signed-off-by Fabiano Rosas <[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_aarch64 = \ · line 220
Quoted 9 lines
tests/qtest/meson.build +2
-1@@ -213,7 +213,8 @@ qtests_aarch64 = \ ['tpm-tis-device-test', 'tpm-tis-device-swtpm-test'] : []) + \ (config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \ (config_all_devices.has_key('CONFIG_RASPI') ? ['bcm2835-dma-test'] : []) + \ - (config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \ + (config_all.has_key('CONFIG_TCG') and \ + config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \ ['arm-cpu-features', 'numa-test', 'boot-serial-test',
Re: [PATCH v11 12/13] tests/qtest: Restrict tpm-tis-i2c-test to CONFIG_TCG
In reply to Fabiano RosasQuoted 6 lines · Fabiano Rosas
The test set -accel tcg, so restrict it to when TCG is present.
Signed-off-by Fabiano Rosas<[email protected]>--- tests/qtest/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
r~
PATCH v11 13/13 gitlab-ci: Check building KVM-only aarch64 target
In reply to Fabiano RosasFrom: Philippe Mathieu-Daudé <[email protected]>
Add a manual new job to cross-build the aarch64 target with only the KVM accelerator enabled (in particular, no TCG).
Re-enable running the similar job on the project Aarch64 custom runner.
--- .gitlab-ci.d/crossbuilds.yml | 11 +++++++++++ .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml | 4 ---- 2 files changed, 11 insertions(+), 4 deletions(-)
.gitlab-ci.d/crossbuilds.yml +11 -0
@@ -196,3 +196,14 @@ cross-arm64-xen-only: IMAGE: debian-arm64-cross ACCEL: xen EXTRA_CONFIGURE_OPTS: --disable-tcg --disable-kvm + +# Similar job is run by qemu-project's custom runner by default +cross-arm64-kvm-only: + extends: .cross_accel_build_job + needs: + job: arm64-debian-cross-container + variables: + QEMU_JOB_OPTIONAL: 1 + IMAGE: debian-arm64-cross + ACCEL: kvm + EXTRA_CONFIGURE_OPTS: --disable-tcg --disable-xen --without-default-devices
.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml +0 -4
@@ -115,11 +115,7 @@ ubuntu-22.04-aarch64-notcg: - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - when: manual - allow_failure: true - if: "$AARCH64_RUNNER_AVAILABLE" - when: manual - allow_failure: true script: - mkdir build - cd build
Signature · 1 line
2.35.3
Re: [PATCH v11 13/13] gitlab-ci: Check building KVM-only aarch64 target
Quoted 8 lines · Fabiano Rosas
From: Philippe Mathieu-Daudé<[email protected]>
Add a manual new job to cross-build the aarch64 target with only the KVM accelerator enabled (in particular, no TCG).
Re-enable running the similar job on the project Aarch64 custom runner.
Quoted 7 lines
Signed-off-by Philippe Mathieu-Daudé<[email protected]>Signed-off-by Fabiano Rosas<[email protected]>Reviewed-by Thomas Huth<[email protected]>--- .gitlab-ci.d/crossbuilds.yml | 11 +++++++++++ .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml | 4 ---- 2 files changed, 11 insertions(+), 4 deletions(-)
r~
Peter Maydell
AppliedQuoted 8 lines · Fabiano Rosas
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
Quoted 5 lines · Peter Maydell
Quoted 3 lines · Fabiano Rosas
Hi,
Quoted 8 lines
Quoted 5 lines
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
Quoted 13 lines · Peter Maydell
Quoted 11 lines · Peter Maydell
Quoted 8 lines · Fabiano Rosas
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).
Quoted 7 lines
Quoted 2 lines
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
Quoted 27 lines · Peter Maydell
Quoted 13 lines · Peter Maydell
Quoted 11 lines · Peter Maydell
Quoted 8 lines · Fabiano Rosas
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).Quoted 7 lines
Quoted 2 lines
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
Quoted 5 lines
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.
Quoted 29 lines · Fabiano Rosas
Quoted 27 lines · Peter Maydell
Quoted 13 lines · Peter Maydell
Quoted 11 lines · Peter Maydell
Quoted 8 lines · Fabiano Rosas
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).Quoted 7 lines
Quoted 2 lines
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
Quoted 8 lines
Quoted 5 lines
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 <[email protected]>
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(+)
tests/qtest/cdrom-test.c +5 -0
@@ -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 ();
Signature · 1 line
2.35.3