target/arm: Allow CONFIG_TCG=n builds
v8 cover target/arm: Allow CONFIG_TCG=n builds
Changes since v7:
- patch 8: moved calls to qtest_has_accel after g_test_init to avoid
the TAP error;
- moved the avocado patch towards the end of the series so we can merge the rest without it if needed;
- two new patches to fix regressions due to gdbstub changes.
CI run: https://gitlab.com/farosas/qemu/-/pipelines/801656194
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 (9):
target/arm: Move cortex sysregs into a separate file target/arm: Move 64-bit TCG CPUs into tcg/ target/arm: Move aa32_max_features out of cpu_tcg.c arm/Kconfig: Always select SEMIHOSTING when TCG is present arm/Kconfig: Do not build TCG-only boards on a KVM-only build tests/qtest: Fix tests when no KVM or TCG are present tests/avocado: Pass parameters to migration test target/arm: gdbstub: Guard M-profile code with CONFIG_TCG target/arm: gdbstub: Guard pauth code with 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/cpu.c | 69 +++
target/arm/cpu64.c | 399 +---------------
target/arm/gdbstub.c | 6 +
target/arm/gdbstub64.c | 2 +
target/arm/internals.h | 7 +-
target/arm/meson.build | 2 +-
target/arm/{cpu_tcg.c => tcg/cpu32.c} | 141 +-----
target/arm/tcg/cpu64.c | 438 ++++++++++++++++++
target/arm/tcg/meson.build | 2 +
tests/avocado/migration.py | 83 +++-
tests/qtest/arm-cpu-features.c | 12 +-
tests/qtest/bios-tables-test.c | 10 +-
tests/qtest/boot-serial-test.c | 10 +
tests/qtest/migration-test.c | 9 +-
tests/qtest/pxe-test.c | 7 +-
tests/qtest/vmgenid-test.c | 8 +-
25 files changed, 787 insertions(+), 607 deletions(-)
create mode 100644 target/arm/cortex-regs.c
rename target/arm/{cpu_tcg.c => tcg/cpu32.c} (87%)
create mode 100644 target/arm/tcg/cpu64.cSignature · 1 line
2.35.3
PATCH v8 1/11 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
@@ -29,6 +29,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
@@ -1370,12 +1370,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
PATCH v8 2/11 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
For the special case "max" CPU, there's a nuance that while KVM/HVF use the "host" model instead, we still cannot move all of the TCG code into the tcg directory because the qtests might reach the !kvm && !hvf branch.
--- hw/arm/virt.c | 6 +- target/arm/cpu64.c | 398 +-------------------------------- target/arm/internals.h | 1 + target/arm/tcg/cpu64.c | 438 +++++++++++++++++++++++++++++++++++++ target/arm/tcg/meson.build | 1 + 5 files changed, 445 insertions(+), 399 deletions(-) create mode 100644 target/arm/tcg/cpu64.c
hw/arm/virt.c +4 -2
@@ -206,14 +206,16 @@ static const int a15irqmap[] = {static const char *valid_cpus[] = {ARM_CPU_TYPE_NAME ("cortex-a7" ),ARM_CPU_TYPE_NAME ("cortex-a15" ), +#ifdef CONFIG_TCGARM_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 +1 -397
424 lines not on this page · raw message
target/arm/internals.h +1 -0
@@ -1355,6 +1355,7 @@ 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_add_sve_properties (Object *obj);#endif /* Read the CONTROL register as the MRS instruction would. */
target/arm/tcg/cpu64.c new file +438 -0
438 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
PATCH v8 3/11 target/arm: Move aa32_max_features out of cpu_tcg.c
In reply to Fabiano RosasIn preparation to moving the cpu_tcg.c code into a 32-bit, tcg-only file, move the aa32_max_features function which is shared between 32/64/tcg/non-tcg into cpu.c.
--- target/arm/cpu.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ target/arm/cpu_tcg.c | 69 -------------------------------------------- 2 files changed, 69 insertions(+), 69 deletions(-)
target/arm/cpu.c +69 -0
@@ -2158,6 +2158,75 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) acc->parent_realize (dev, errp); } +/* Share AArch32 -cpu max features with AArch64. */ +void aa32_max_features (ARMCPU *cpu) +{ +uint32_t t; + +/* Add additional features supported by QEMU */ + t = cpu->isar.id_isar5; + t =FIELD_DP32 (t,ID_ISAR5 ,AES ,2 );/* FEAT_PMULL */ + t =FIELD_DP32 (t,ID_ISAR5 ,SHA1 ,1 );/* FEAT_SHA1 */ + t =FIELD_DP32 (t,ID_ISAR5 ,SHA2 ,1 );/* FEAT_SHA256 */ + t =FIELD_DP32 (t,ID_ISAR5 ,CRC32 ,1 ); + t =FIELD_DP32 (t,ID_ISAR5 ,RDM ,1 );/* FEAT_RDM */ + t =FIELD_DP32 (t,ID_ISAR5 ,VCMA ,1 );/* FEAT_FCMA */ + cpu->isar.id_isar5 = t; + + t = cpu->isar.id_isar6; + t =FIELD_DP32 (t,ID_ISAR6 ,JSCVT ,1 );/* FEAT_JSCVT */ + t =FIELD_DP32 (t,ID_ISAR6 ,DP ,1 );/* Feat_DotProd */ + t =FIELD_DP32 (t,ID_ISAR6 ,FHM ,1 );/* FEAT_FHM */ + t =FIELD_DP32 (t,ID_ISAR6 ,SB ,1 );/* FEAT_SB */ + t =FIELD_DP32 (t,ID_ISAR6 ,SPECRES ,1 );/* FEAT_SPECRES */ + t =FIELD_DP32 (t,ID_ISAR6 ,BF16 ,1 );/* FEAT_AA32BF16 */ + t =FIELD_DP32 (t,ID_ISAR6 ,I8MM ,1 );/* FEAT_AA32I8MM */ + cpu->isar.id_isar6 = t; + + t = cpu->isar.mvfr1; + t =FIELD_DP32 (t,MVFR1 ,FPHP ,3 );/* FEAT_FP16 */ + t =FIELD_DP32 (t,MVFR1 ,SIMDHP ,2 );/* FEAT_FP16 */ + cpu->isar.mvfr1 = t; + + t = cpu->isar.mvfr2; + t =FIELD_DP32 (t,MVFR2 ,SIMDMISC ,3 );/* SIMD MaxNum */ + t =FIELD_DP32 (t,MVFR2 ,FPMISC ,4 );/* FP MaxNum */ + cpu->isar.mvfr2 = t; + + t = cpu->isar.id_mmfr3; + t =FIELD_DP32 (t,ID_MMFR3 ,PAN ,2 );/* FEAT_PAN2 */ + cpu->isar.id_mmfr3 = t; + + t = cpu->isar.id_mmfr4; + t =FIELD_DP32 (t,ID_MMFR4 ,HPDS ,1 );/* FEAT_AA32HPD */ + t =FIELD_DP32 (t,ID_MMFR4 ,AC2 ,1 );/* ACTLR2, HACTLR2 */ + t =FIELD_DP32 (t,ID_MMFR4 ,CNP ,1 );/* FEAT_TTCNP */ + t =FIELD_DP32 (t,ID_MMFR4 ,XNX ,1 );/* FEAT_XNX */ + t =FIELD_DP32 (t,ID_MMFR4 ,EVT ,2 );/* FEAT_EVT */ + cpu->isar.id_mmfr4 = t; + + t = cpu->isar.id_mmfr5; + t =FIELD_DP32 (t,ID_MMFR5 ,ETS ,1 );/* FEAT_ETS */ + cpu->isar.id_mmfr5 = t; + + t = cpu->isar.id_pfr0; + t =FIELD_DP32 (t,ID_PFR0 ,CSV2 ,2 );/* FEAT_CVS2 */ + t =FIELD_DP32 (t,ID_PFR0 ,DIT ,1 );/* FEAT_DIT */ + t =FIELD_DP32 (t,ID_PFR0 ,RAS ,1 );/* FEAT_RAS */ + cpu->isar.id_pfr0 = t; + + t = cpu->isar.id_pfr2; + t =FIELD_DP32 (t,ID_PFR2 ,CSV3 ,1 );/* FEAT_CSV3 */ + t =FIELD_DP32 (t,ID_PFR2 ,SSBS ,1 );/* FEAT_SSBS */ + cpu->isar.id_pfr2 = t; + + t = cpu->isar.id_dfr0; + t =FIELD_DP32 (t,ID_DFR0 ,COPDBG ,9 );/* FEAT_Debugv8p4 */ + t =FIELD_DP32 (t,ID_DFR0 ,COPSDBG ,9 );/* FEAT_Debugv8p4 */ + t =FIELD_DP32 (t,ID_DFR0 ,PERFMON ,6 );/* FEAT_PMUv3p5 */ + cpu->isar.id_dfr0 = t; +} +static ObjectClass *arm_cpu_class_by_name (const char *cpu_model) {ObjectClass *oc;
target/arm/cpu_tcg.c +0 -69
75 lines not on this page · raw message
Signature · 1 line
2.35.3
Re: [PATCH v8 03/11] target/arm: Move aa32_max_features out of cpu_tcg.c
Quoted 9 lines · Fabiano Rosas
In preparation to moving the
cpu_tcg.ccode into a 32-bit, tcg-only file, move theaa32_max_featuresfunction which is shared between 32/64/tcg/non-tcg intocpu.c.Signed-off-by Fabiano Rosas <[email protected]>--- target/arm/cpu.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ target/arm/cpu_tcg.c | 69 -------------------------------------------- 2 files changed, 69 insertions(+), 69 deletions(-)
I'm not keen on this, as it's completely tcg.
Perhaps it would be better to let -cpu max devolve to aarch64_a57_initfn when tcg is not available (i.e. qtest_enabled())? Move all of the tcg stuff out of aarch64_max_initfn into tcg/cpu64.c.
Thoughts?
r~
Re: [PATCH v8 03/11] target/arm: Move aa32_max_features out of cpu_tcg.c
Quoted 11 lines · Richard Henderson
Quoted 9 lines · Fabiano Rosas
In preparation to moving the
cpu_tcg.ccode into a 32-bit, tcg-only file, move theaa32_max_featuresfunction which is shared between 32/64/tcg/non-tcg intocpu.c.Signed-off-by Fabiano Rosas <[email protected]>--- target/arm/cpu.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ target/arm/cpu_tcg.c | 69 -------------------------------------------- 2 files changed, 69 insertions(+), 69 deletions(-)
Quoted 8 lines
I'm not keen on this, as it's completely tcg.
Perhaps it would be better to let -cpu max devolve to
aarch64_a57_initfnwhen tcg is not available (i.e.qtest_enabled())? Move all of the tcg stuff out ofaarch64_max_initfnintotcg/cpu64.c.Thoughts?
That's what I had in v6. I would prefer it that way as well. Perhaps I was too quick in changing it.
https://lore.kernel.org/all/[email protected]/
Unless anyone says otherwise, I'll revert back to that state.
PATCH v8 4/11 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/meson.build | 1 +
tests/qtest/arm-cpu-features.c | 12 +++++++++---
5 files changed, 14 insertions(+), 15 deletions(-)
rename target/arm/{cpu_tcg.c => tcg/cpu32.c} (99%)hw/arm/virt.c +1 -1
@@ -204,9 +204,9 @@ static const int a15irqmap[] = { };static const char *valid_cpus[] = { +#ifdef CONFIG_TCGARM_CPU_TYPE_NAME ("cortex-a7" ),ARM_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 )
@@ -27,7 +25,7 @@/* 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);
@@ -51,7 +49,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) {
@@ -947,7 +945,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,
@@ -968,7 +965,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) {
@@ -976,10 +972,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/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',
tests/qtest/arm-cpu-features.c +9 -3
@@ -506,9 +506,15 @@ 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 ); +if (qtest_has_accel ("tcg" )) { +assert_error (qts,"cortex-a15" , +"We cannot guarantee the CPU type 'cortex-a15' works " +"with KVM on this host" ,NULL ); + }else { +assert_error (qts,"cortex-a15" , +"The CPU type 'cortex-a15' is not a " +"recognized ARM CPU type" ,NULL ); + }assert_has_feature_enabled (qts,"host" ,"aarch64" );
Signature · 1 line
2.35.3
PATCH v8 5/11 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
@@ -316,7 +316,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 v8 6/11 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 v8 7/11 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
@@ -220,3 +220,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
PATCH v8 8/11 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.
Fix 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.
---
This currently affects Arm, but will also affect x86 after the xenpvh series gets merged. This patch fixes both scenarios.
--- tests/qtest/bios-tables-test.c | 10 ++++++++-- tests/qtest/boot-serial-test.c | 10 ++++++++++ tests/qtest/migration-test.c | 9 ++++++++- tests/qtest/pxe-test.c | 7 ++++++- tests/qtest/vmgenid-test.c | 8 ++++++-- 5 files changed, 38 insertions(+), 6 deletions(-)
tests/qtest/bios-tables-test.c +8 -2
@@ -2109,8 +2109,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;
@@ -2120,6 +2119,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) { +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 +10 -0
@@ -17,6 +17,9 @@#include "libqtest.h" #include "libqos/libqos-spapr.h" +static bool has_tcg; +static bool has_kvm; +static const uint8_t bios_avr[] = {0x88 ,0xe0 ,/* ldi r24, 0x08 */ 0x80 ,0x93 ,0xc1 ,0x00 ,/* sts 0x00C1, r24 ; Enable tx */
@@ -287,6 +290,13 @@ int main(int argc, char *argv[])g_test_init (&argc, &argv,NULL ); + has_tcg =qtest_has_accel ("tcg" ); + has_kvm =qtest_has_accel ("kvm" ); + +if (!has_tcg && !has_kvm) { +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
@@ -2459,7 +2459,7 @@ static bool kvm_dirty_ring_supported(void)int main (int argc,char **argv) { -const bool has_kvm =qtest_has_accel ("kvm" ); +bool has_kvm, has_tcg;const bool has_uffd =ufd_version_check ();const char *arch =qtest_get_arch ();g_autoptr (GError) err =NULL ;
@@ -2467,6 +2467,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) { +return 0 ; + } +/* * On ppc64, the test only works with kvm-hv, but not with kvm-pr and TCG * is touchy due to race conditions on dirty bits (especially on PPC for
tests/qtest/pxe-test.c +6 -1
@@ -131,11 +131,16 @@ 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" )) { +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 +6 -2
@@ -165,13 +165,17 @@ int main(int argc, char **argv) {int ret; +g_test_init (&argc, &argv,NULL ); + +if (!qtest_has_accel ("tcg" ) && !qtest_has_accel ("kvm" )) { +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 v8 08/11] tests/qtest: Fix tests when no KVM or TCG are present
Quoted 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.
Fix tests that crash or hang in the above scenario. Do not include any test cases if TCG and KVM are missing.
Quoted 6 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.Signed-off-by Fabiano Rosas <[email protected]>Reviewed-by Juan Quintela <[email protected]>
I don't like it that we are hard-coding the list of accelerators like this. Make a wrapper?
Quoted 26 lines
---
This currently affects Arm, but will also affect x86 after the xenpvh series gets merged. This patch fixes both scenarios.--- tests/qtest/bios-tables-test.c | 10 ++++++++-- tests/qtest/boot-serial-test.c | 10 ++++++++++ tests/qtest/migration-test.c | 9 ++++++++- tests/qtest/pxe-test.c | 7 ++++++- tests/qtest/vmgenid-test.c | 8 ++++++-- 5 files changed, 38 insertions(+), 6 deletions(-)tests/qtest/bios-tables-test.c +1
-2@@ -2109,8 +2109,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;
tests/qtest/bios-tables-test.c int main(int argc, char *argv[]) · line 2124
Quoted 6 lines
tests/qtest/bios-tables-test.c +3
-0@@ -2120,6 +2119,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" ); +
why are you moving these? init at declaration time is generally cleaner.
Quoted 22 lines
tests/qtest/bios-tables-test.c +4
-0+if (!has_tcg && !has_kvm) { +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 +3
-0@@ -17,6 +17,9 @@#include "libqtest.h" #include "libqos/libqos-spapr.h" +static bool has_tcg; +static bool has_kvm; +static const uint8_t bios_avr[] = {0x88 ,0xe0 ,/* ldi r24, 0x08 */ 0x80 ,0x93 ,0xc1 ,0x00 ,/* sts 0x00C1, r24 ; Enable tx */
tests/qtest/boot-serial-test.c int main(int argc, char *argv[]) · line 295
Quoted 6 lines
tests/qtest/boot-serial-test.c +3
-0@@ -287,6 +290,13 @@ int main(int argc, char *argv[])g_test_init (&argc, &argv,NULL ); + has_tcg =qtest_has_accel ("tcg" ); + has_kvm =qtest_has_accel ("kvm" ); +
and here why do we need them global?
Quoted 21 lines
tests/qtest/boot-serial-test.c +4
-0+if (!has_tcg && !has_kvm) { +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 +1
-1@@ -2459,7 +2459,7 @@ static bool kvm_dirty_ring_supported(void)int main (int argc,char **argv) { -const bool has_kvm =qtest_has_accel ("kvm" ); +bool has_kvm, has_tcg;const bool has_uffd =ufd_version_check ();const char *arch =qtest_get_arch ();g_autoptr (GError) err =NULL ;
tests/qtest/migration-test.c int main(int argc, char **argv) · line 2472
Quoted 6 lines
tests/qtest/migration-test.c +3
-0@@ -2467,6 +2467,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" ); +
same. why the move?
Quoted 55 lines
tests/qtest/migration-test.c +4
-0+if (!has_tcg && !has_kvm) { +return 0 ; + } +/* * On ppc64, the test only works with kvm-hv, but not with kvm-pr and TCG * is touchy due to race conditions on dirty bits (especially on PPC for tests/qtest/pxe-test.c +6
-1@@ -131,11 +131,16 @@ 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" )) { +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 +6
-2@@ -165,13 +165,17 @@ int main(int argc, char **argv) {int ret; +g_test_init (&argc, &argv,NULL ); + +if (!qtest_has_accel ("tcg" ) && !qtest_has_accel ("kvm" )) { +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 v8 08/11] tests/qtest: Fix tests when no KVM or TCG are present
Quoted 15 lines · Michael S. Tsirkin
Quoted 14 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.
Fix 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.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Fabiano Rosas <[email protected]>Reviewed-by Juan Quintela <[email protected]>I don't like it that we are hard-coding the list of accelerators like this. Make a wrapper?
Are you thinking of some sort of "has_any_accel" wrapper?
Some of the code uses has_tcg/kvm for other purposes, so there would be slight duplication. And the issue really is !tcg && !kvm, i.e. other accelerators are not taken into account.
Quoted 27 lines
Quoted 27 lines
---
This currently affects Arm, but will also affect x86 after the xenpvh series gets merged. This patch fixes both scenarios.--- tests/qtest/bios-tables-test.c | 10 ++++++++-- tests/qtest/boot-serial-test.c | 10 ++++++++++ tests/qtest/migration-test.c | 9 ++++++++- tests/qtest/pxe-test.c | 7 ++++++- tests/qtest/vmgenid-test.c | 8 ++++++-- 5 files changed, 38 insertions(+), 6 deletions(-)tests/qtest/bios-tables-test.c +1
-2@@ -2109,8 +2109,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;@@ -2120,6 +2119,13 @@ int main(int argc, char *argv[])
Quoted 9 lines
tests/qtest/bios-tables-test.c int main(int argc, char *argv[]) · line 2124
Quoted 5 lines
tests/qtest/bios-tables-test.c +3
-0g_test_init (&argc, &argv,NULL ); + has_kvm =qtest_has_accel ("kvm" ); + has_tcg =qtest_has_accel ("tcg" ); +why are you moving these? init at declaration time is generally cleaner.
Thomas had asked me to put calls to qtest_has_accel after g_test_init. I just brought the existing one along for consistency. From the commit message:
"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."
Quoted 23 lines
Quoted 23 lines
tests/qtest/bios-tables-test.c +4
-0+if (!has_tcg && !has_kvm) { +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 +3
-0@@ -17,6 +17,9 @@#include "libqtest.h" #include "libqos/libqos-spapr.h" +static bool has_tcg; +static bool has_kvm; +static const uint8_t bios_avr[] = {0x88 ,0xe0 ,/* ldi r24, 0x08 */ 0x80 ,0x93 ,0xc1 ,0x00 ,/* sts 0x00C1, r24 ; Enable tx */ @@ -287,6 +290,13 @@ int main(int argc, char *argv[])
Quoted 8 lines
tests/qtest/boot-serial-test.c int main(int argc, char *argv[]) · line 295
Quoted 5 lines
tests/qtest/boot-serial-test.c +3
-0g_test_init (&argc, &argv,NULL ); + has_tcg =qtest_has_accel ("tcg" ); + has_kvm =qtest_has_accel ("kvm" ); +and here why do we need them global?
I was trying to make things easier when merging this other series that puts the variables there as well:
https://lore.kernel.org/r/[email protected]
Second time I get asked this so I'll change it for the next version =)
Quoted 22 lines
Quoted 22 lines
tests/qtest/boot-serial-test.c +4
-0+if (!has_tcg && !has_kvm) { +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 +1
-1@@ -2459,7 +2459,7 @@ static bool kvm_dirty_ring_supported(void)int main (int argc,char **argv) { -const bool has_kvm =qtest_has_accel ("kvm" ); +bool has_kvm, has_tcg;const bool has_uffd =ufd_version_check ();const char *arch =qtest_get_arch ();g_autoptr (GError) err =NULL ;@@ -2467,6 +2467,13 @@ int main(int argc, char **argv)
Quoted 8 lines
tests/qtest/migration-test.c int main(int argc, char **argv) · line 2472
Quoted 5 lines
tests/qtest/migration-test.c +3
-0g_test_init (&argc, &argv,NULL ); + has_kvm =qtest_has_accel ("kvm" ); + has_tcg =qtest_has_accel ("tcg" ); +same. why the move?
g_test_init
Quoted 55 lines
Quoted 55 lines
tests/qtest/migration-test.c +4
-0+if (!has_tcg && !has_kvm) { +return 0 ; + } +/* * On ppc64, the test only works with kvm-hv, but not with kvm-pr and TCG * is touchy due to race conditions on dirty bits (especially on PPC for tests/qtest/pxe-test.c +6
-1@@ -131,11 +131,16 @@ 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" )) { +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 +6
-2@@ -165,13 +165,17 @@ int main(int argc, char **argv) {int ret; +g_test_init (&argc, &argv,NULL ); + +if (!qtest_has_accel ("tcg" ) && !qtest_has_accel ("kvm" )) { +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 v8 08/11] tests/qtest: Fix tests when no KVM or TCG are present
Quoted 17 lines · Fabiano Rosas
Quoted 15 lines · Michael S. Tsirkin
Quoted 14 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.
Fix 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.
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
Signed-off-by Fabiano Rosas <[email protected]>Reviewed-by Juan Quintela <[email protected]>I don't like it that we are hard-coding the list of accelerators like this. Make a wrapper?
Are you thinking of some sort of "
has_any_accel" wrapper?
I think in the long run, we want something like what I described here:
https://lore.kernel.org/qemu-devel/[email protected]/
Quoted 12 lines
Quoted 11 lines
tests/qtest/bios-tables-test.c int main(int argc, char *argv[]) · line 2124
Quoted 7 lines
tests/qtest/bios-tables-test.c +3
-0@@ -2120,6 +2119,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" ); +why are you moving these? init at declaration time is generally cleaner.
Quoted 7 lines
Thomas had asked me to put calls to
qtest_has_accelafterg_test_init. I just brought the existing one along for consistency. From the commit message:"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."
Right, otherwise this might cause problems with the latest version of glib (in Fedora, I think).
Thomas
Re: [PATCH v8 08/11] tests/qtest: Fix tests when no KVM or TCG are present
Quoted 25 lines · Thomas Huth
Quoted 24 lines · Fabiano Rosas
Quoted 21 lines · Michael S. Tsirkin
Quoted 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.
Fix tests that crash or hang in the above scenario. Do not include any test cases if TCG and KVM are missing.
Quoted 6 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.Signed-off-by Fabiano Rosas <[email protected]>Reviewed-by Juan Quintela <[email protected]>I don't like it that we are hard-coding the list of accelerators like this. Make a wrapper?
Quoted 6 lines
Quoted 1 line
Are you thinking of some sort of "
has_any_accel" wrapper?I think in the long run, we want something like what I described here:
Wont't that function be too generic? The choice of accelerator is quite specific to each individual test, some might not work with TCG, some might not work with HVF and so on. There is no link between build-time configuration and runtime test execution after all. We could always have a build without an accelerator and then try to run a test that uses that accelerator. And also have an accelerator present that the test does not support at all.
For this particularly bizarre case of not having TCG nor KVM in the build I'm inclined to go with Michael's suggestion of checking it at build time and skipping all the hassle. This is what I'm preparing:
tests/qtest/meson.build +7 -2
@@ -27,6 +27,12 @@ if config_host.has_key('CONFIG_MODULES') qtests_generic += [ 'modules-test' ] endif +# For x86_64, i386 and aarch64 it is possible to have only Xen as an +# accelerator. Some tests require either TCG or KVM, so make sure they +# are present before building those tests. +tcg_or_kvm_available = (config_all.has_key('CONFIG_TCG') or + config_all.has_key('CONFIG_KVM')) + qtests_pci = \ (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) + \ (config_all_devices.has_key('CONFIG_IVSHMEM_DEVICE') ? ['ivshmem-test'] : [])
@@ -40,11 +46,12 @@ qtests_filter = \ (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) qtests_i386 = \ - (slirp.found() ? ['pxe-test'] : []) + \ + (slirp.found() and tcg_or_kvm_available ? ['pxe-test'] : []) + \ ---
What do you think?
Re: [PATCH v8 08/11] tests/qtest: Fix tests when no KVM or TCG are present
Quoted 72 lines · Fabiano Rosas
Quoted 25 lines · Thomas Huth
Quoted 24 lines · Fabiano Rosas
Quoted 21 lines · Michael S. Tsirkin
Quoted 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.
Fix tests that crash or hang in the above scenario. Do not include any test cases if TCG and KVM are missing.
Quoted 6 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.Signed-off-by Fabiano Rosas <[email protected]>Reviewed-by Juan Quintela <[email protected]>I don't like it that we are hard-coding the list of accelerators like this. Make a wrapper?
Quoted 6 lines
Quoted 1 line
Are you thinking of some sort of "
has_any_accel" wrapper?I think in the long run, we want something like what I described here:
Wont't that function be too generic? The choice of accelerator is quite specific to each individual test, some might not work with TCG, some might not work with HVF and so on. There is no link between build-time configuration and runtime test execution after all. We could always have a build without an accelerator and then try to run a test that uses that accelerator. And also have an accelerator present that the test does not support at all.
For this particularly bizarre case of not having TCG nor KVM in the build I'm inclined to go with Michael's suggestion of checking it at build time and skipping all the hassle. This is what I'm preparing:
tests/qtest/meson.build +7
-2@@ -27,6 +27,12 @@ if config_host.has_key('CONFIG_MODULES') qtests_generic += [ 'modules-test' ] endif +# For x86_64, i386 and aarch64 it is possible to have only Xen as an +# accelerator. Some tests require either TCG or KVM, so make sure they +# are present before building those tests. +tcg_or_kvm_available = (config_all.has_key('CONFIG_TCG') or + config_all.has_key('CONFIG_KVM')) + qtests_pci = \ (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) + \ (config_all_devices.has_key('CONFIG_IVSHMEM_DEVICE') ? ['ivshmem-test'] : [])@@ -40,11 +46,12 @@ qtests_filter = \ (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) qtests_i386 = \ - (slirp.found() ? ['pxe-test'] : []) + \ + (slirp.found() and tcg_or_kvm_available ? ['pxe-test'] : []) + \ ---
Quoted 1 line
What do you think?
It's likely ok as additional check for Xen-only builds, but we certainly cannot remove the runtime checks for KVM (it's perfectly fine to have KVM included during compilation - but unavailable during runtime (e.g. if the kernel module is not loaded).
Thomas
Re: [PATCH v8 08/11] tests/qtest: Fix tests when no KVM or TCG are present
Quoted 56 lines · Thomas Huth
Quoted 55 lines · Fabiano Rosas
Quoted 25 lines · Thomas Huth
Quoted 24 lines · Fabiano Rosas
Quoted 21 lines · Michael S. Tsirkin
Quoted 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.
Fix tests that crash or hang in the above scenario. Do not include any test cases if TCG and KVM are missing.
Quoted 6 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.Signed-off-by Fabiano Rosas <[email protected]>Reviewed-by Juan Quintela <[email protected]>I don't like it that we are hard-coding the list of accelerators like this. Make a wrapper?
Quoted 6 lines
Quoted 1 line
Are you thinking of some sort of "
has_any_accel" wrapper?I think in the long run, we want something like what I described here:
Wont't that function be too generic? The choice of accelerator is quite specific to each individual test, some might not work with TCG, some might not work with HVF and so on. There is no link between build-time configuration and runtime test execution after all. We could always have a build without an accelerator and then try to run a test that uses that accelerator. And also have an accelerator present that the test does not support at all.
For this particularly bizarre case of not having TCG nor KVM in the build I'm inclined to go with Michael's suggestion of checking it at build time and skipping all the hassle. This is what I'm preparing:
tests/qtest/meson.build +0
-0@@ -27,6 +27,12 @@ if config_host.has_key('CONFIG_MODULES') qtests_generic += [ 'modules-test' ] endif
Quoted 5 lines
tests/qtest/meson.build if config_host.has_key('CONFIG_MODULES') · line 34
Quoted 5 lines
tests/qtest/meson.build +5
-0+# For x86_64, i386 and aarch64 it is possible to have only Xen as an +# accelerator. Some tests require either TCG or KVM, so make sure they +# are present before building those tests. +tcg_or_kvm_available = (config_all.has_key('CONFIG_TCG') or + config_all.has_key('CONFIG_KVM'))
Ouch, this doesn't work because one of the binaries could still have KVM support and we build the tests only once.
On an aarch64 host:
---disable-tcg --enable-kvm --enable-xen =>
qemu-system-aarch64 w/ Xen, KVM, no TCG
qemu-system-x86_64 w/ Xen, no KVM, no TCG
Re: [PATCH v8 08/11] 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.
Fix tests that crash or hang in the above scenario. Do not include any test cases if TCG and KVM are missing.
Quoted 6 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.Signed-off-by Fabiano Rosas <[email protected]>Reviewed-by Juan Quintela <[email protected]>
I don't like it that it's a pass not a skip.
Also, if we are not testing acpi should we not
skip building acpi?
Also, a misconfigured qemu would previously be caught, now it will seem to pass tests.
How about a special make check target that will just test xen things?
Quoted 142 lines
---
This currently affects Arm, but will also affect x86 after the xenpvh series gets merged. This patch fixes both scenarios.--- tests/qtest/bios-tables-test.c | 10 ++++++++-- tests/qtest/boot-serial-test.c | 10 ++++++++++ tests/qtest/migration-test.c | 9 ++++++++- tests/qtest/pxe-test.c | 7 ++++++- tests/qtest/vmgenid-test.c | 8 ++++++-- 5 files changed, 38 insertions(+), 6 deletions(-)tests/qtest/bios-tables-test.c +8
-2@@ -2109,8 +2109,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;@@ -2120,6 +2119,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) { +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 +10
-0@@ -17,6 +17,9 @@#include "libqtest.h" #include "libqos/libqos-spapr.h" +static bool has_tcg; +static bool has_kvm; +static const uint8_t bios_avr[] = {0x88 ,0xe0 ,/* ldi r24, 0x08 */ 0x80 ,0x93 ,0xc1 ,0x00 ,/* sts 0x00C1, r24 ; Enable tx */ @@ -287,6 +290,13 @@ int main(int argc, char *argv[])g_test_init (&argc, &argv,NULL ); + has_tcg =qtest_has_accel ("tcg" ); + has_kvm =qtest_has_accel ("kvm" ); + +if (!has_tcg && !has_kvm) { +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@@ -2459,7 +2459,7 @@ static bool kvm_dirty_ring_supported(void)int main (int argc,char **argv) { -const bool has_kvm =qtest_has_accel ("kvm" ); +bool has_kvm, has_tcg;const bool has_uffd =ufd_version_check ();const char *arch =qtest_get_arch ();g_autoptr (GError) err =NULL ;@@ -2467,6 +2467,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) { +return 0 ; + } +/* * On ppc64, the test only works with kvm-hv, but not with kvm-pr and TCG * is touchy due to race conditions on dirty bits (especially on PPC for tests/qtest/pxe-test.c +6
-1@@ -131,11 +131,16 @@ 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" )) { +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 +6
-2@@ -165,13 +165,17 @@ int main(int argc, char **argv) {int ret; +g_test_init (&argc, &argv,NULL ); + +if (!qtest_has_accel ("tcg" ) && !qtest_has_accel ("kvm" )) { +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 v8 08/11] tests/qtest: Fix tests when no KVM or TCG are present
Quoted 11 lines · Michael S. Tsirkin
Quoted 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.
Fix tests that crash or hang in the above scenario. Do not include any test cases if TCG and KVM are missing.
Quoted 9 lines
Quoted 6 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.Signed-off-by Fabiano Rosas <[email protected]>Reviewed-by Juan Quintela <[email protected]>I don't like it that it's a pass not a skip.
Noted. I'm always questioning myself whether to skip or pass.
Quoted 3 lines
Also, if we are not testing acpi should we not
skip building acpi?
Good point. I'll try to do that for the next version.
Quoted 2 lines
Also, a misconfigured qemu would previously be caught, now it will seem to pass tests.
Well, we can only call it misconfigured if we have a specific setup in mind. In the general sense there is never a misconfigured qemu unless there's a bug in the configuration path (configure, Kconfig, meson, etc). Then these tests would have nothing to do with it.
So in this particular case, the "bug" perhaps is that we're still trying to build and run the tests even when the accelerator(s) they require are not present. I think your suggestion above of not building the test covers that.
Quoted 3 lines
How about a special make check target that will just test xen things?
Probably overkill for this particular issue. I don't see any Xen-specific tests yet. It would run almost the same set of tests.
Re: [PATCH v8 08/11] tests/qtest: Fix tests when no KVM or TCG are present
Quoted 6 lines · Fabiano Rosas
Quoted 3 lines
How about a special make check target that will just test xen things?
Probably overkill for this particular issue. I don't see any Xen-specific tests yet. It would run almost the same set of tests.
Well, a subset for now.
Signature · 1 line
MST
PATCH v8 9/11 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
Re: [PATCH v8 09/11] tests/avocado: Pass parameters to migration test
Quoted 7 lines · Fabiano Rosas
The 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.
Quoted 7 lines
Add a skip decorator to keep the current behavior of only running migration tests when the qemu target matches the host architecture.
Signed-off-by Fabiano Rosas <[email protected]>--- tests/avocado/migration.py | 83 +++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 5 deletions(-)
PATCH v8 10/11 target/arm: gdbstub: Guard M-profile code with CONFIG_TCG
In reply to Fabiano RosasThis code is only relevant when TCG is present in the build. If we try to build with --disable-tcg we currently get:
libqemu-aarch64-softmmu.fa.p/target_arm_gdbstub.c.o: in function m_sysreg_ptr': ../target/arm/gdbstub.c:356: undefined reference to arm_v7m_get_sp_ptr'
--- target/arm/gdbstub.c | 4 ++++ 1 file changed, 4 insertions(+)
target/arm/gdbstub.c +4 -0
@@ -322,6 +322,7 @@ static int arm_gen_dynamic_sysreg_xml(CPUState *cs, int base_reg)return cpu->dyn_sysreg_xml.num; } +#ifdef CONFIG_TCG typedef enum { M_SYSREG_MSP, M_SYSREG_PSP,
@@ -479,6 +480,7 @@ static int arm_gen_dynamic_m_secextreg_xml(CPUState *cs, int orig_base_reg)return cpu->dyn_m_secextreg_xml.num; }#endif +#endif /* CONFIG_TCG */ const char *arm_gdb_get_dynamic_xml (CPUState *cs,const char *xmlname) {
@@ -553,6 +555,7 @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu) arm_gen_dynamic_sysreg_xml(cs, cs->gdb_num_regs), "system-registers.xml", 0); +#ifdef CONFIG_TCG if (arm_feature (env,ARM_FEATURE_M )) { gdb_register_coprocessor(cs, arm_gdb_get_m_systemreg, arm_gdb_set_m_systemreg,
@@ -567,4 +570,5 @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu) }#endif } +#endif }
Signature · 1 line
2.35.3
Re: [PATCH v8 10/11] target/arm: gdbstub: Guard M-profile code with CONFIG_TCG
Quoted 11 lines · Fabiano Rosas
This code is only relevant when TCG is present in the build. If we try to build with --disable-tcg we currently get:
libqemu-aarch64-softmmu.fa.p/target_arm_gdbstub.c.o: in functionm_sysreg_ptr': ../target/arm/gdbstub.c:356: undefined reference toarm_v7m_get_sp_ptr'Signed-off-by Fabiano Rosas<[email protected]>--- target/arm/gdbstub.c | 4 ++++ 1 file changed, 4 insertions(+)
r~
Re: [PATCH v8 10/11] target/arm: gdbstub: Guard M-profile code with CONFIG_TCG
In reply to Fabiano RosasQuoted 11 lines · Fabiano Rosas
This code is only relevant when TCG is present in the build. If we try to build with --disable-tcg we currently get:
libqemu-aarch64-softmmu.fa.p/target_arm_gdbstub.c.o: in functionm_sysreg_ptr': ../target/arm/gdbstub.c:356: undefined reference toarm_v7m_get_sp_ptr'Signed-off-by Fabiano Rosas <[email protected]>--- target/arm/gdbstub.c | 4 ++++ 1 file changed, 4 insertions(+)
This patch should come before patches 5-6/11, or become first of this series.
PATCH v8 11/11 target/arm: gdbstub: Guard pauth code with CONFIG_TCG
In reply to Fabiano RosasWe currently don't have the reading of pauth regs implemented for KVM so wrap the pauth registration with CONFIG_TCG.
This avoids the build error when using --disable-tcg:
libqemu-aarch64-softmmu.fa.p/target_arm_gdbstub64.c.o: in function aarch64_gdb_get_pauth_reg': ../target/arm/gdbstub64.c:233: undefined reference to pauth_ptr_mask'
---
Does this make sense? I seem to remember we had a rule that for KVM register values should come from the ONE_REG interface.
--- target/arm/gdbstub.c | 2 ++ target/arm/gdbstub64.c | 2 ++ 2 files changed, 4 insertions(+)
target/arm/gdbstub.c +2 -0
@@ -521,11 +521,13 @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu) aarch64_gdb_set_fpu_reg, 34, "aarch64-fpu.xml", 0); } +#ifdef CONFIG_TCG if (isar_feature_aa64_pauth (&cpu->isar)) {gdb_register_coprocessor (cs, aarch64_gdb_get_pauth_reg, aarch64_gdb_set_pauth_reg,4 ,"aarch64-pauth.xml" ,0 ); } +#endif /* CONFIG_TCG */ #endif }else {if (arm_feature (env,ARM_FEATURE_NEON )) {
target/arm/gdbstub64.c +2 -0
@@ -210,6 +210,7 @@ int aarch64_gdb_set_sve_reg(CPUARMState *env, uint8_t *buf, int reg)return 0 ; } +#ifdef CONFIG_TCG int aarch64_gdb_get_pauth_reg (CPUARMState *env,GByteArray *buf,int reg) {switch (reg) {
@@ -243,6 +244,7 @@ int aarch64_gdb_set_pauth_reg(CPUARMState *env, uint8_t *buf, int reg)/* All pseudo registers are read-only. */ return 0; } +#endif static void output_vector_union_type (GString *s,int reg_width,const char *name)
Signature · 1 line
2.35.3
Re: [PATCH v8 11/11] target/arm: gdbstub: Guard pauth code with CONFIG_TCG
Quoted 23 lines · Fabiano Rosas
We currently don't have the reading of pauth regs implemented for KVM so wrap the pauth registration with
CONFIG_TCG.This avoids the build error when using --disable-tcg:
libqemu-aarch64-softmmu.fa.p/target_arm_gdbstub64.c.o: in functionaarch64_gdb_get_pauth_reg': ../target/arm/gdbstub64.c:233: undefined reference topauth_ptr_mask'Signed-off-by Fabiano Rosas <[email protected]>---
Does this make sense? I seem to remember we had a rule that for KVM register values should come from theONE_REGinterface.--- target/arm/gdbstub.c | 2 ++ target/arm/gdbstub64.c | 2 ++ 2 files changed, 4 insertions(+)target/arm/gdbstub.c +0
-0
target/arm/gdbstub.c void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu) · line 528
Quoted 8 lines
target/arm/gdbstub.c +1
-0@@ -521,11 +521,13 @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu) aarch64_gdb_set_fpu_reg, 34, "aarch64-fpu.xml", 0); } +#ifdef CONFIG_TCG if (isar_feature_aa64_pauth (&cpu->isar)) {gdb_register_coprocessor (cs, aarch64_gdb_get_pauth_reg, aarch64_gdb_set_pauth_reg,4 ,"aarch64-pauth.xml" ,0 );
I think this should be tcg_enabled(), which should avoid the need for ifdef.
r~
Quoted 25 lines
target/arm/gdbstub.c +1
-0} +#endif /* CONFIG_TCG */ #endif }else {if (arm_feature (env,ARM_FEATURE_NEON )) {target/arm/gdbstub64.c +2
-0@@ -210,6 +210,7 @@ int aarch64_gdb_set_sve_reg(CPUARMState *env, uint8_t *buf, int reg)return 0 ; } +#ifdef CONFIG_TCG int aarch64_gdb_get_pauth_reg (CPUARMState *env,GByteArray *buf,int reg) {switch (reg) {@@ -243,6 +244,7 @@ int aarch64_gdb_set_pauth_reg(CPUARMState *env, uint8_t *buf, int reg)/* All pseudo registers are read-only. */ return 0; } +#endif static void output_vector_union_type (GString *s,int reg_width,const char *name)