Re: [PATCH v17 09/14] hw/core/cpu: Remove gdb_get_dynamic_xml member

[Alistair Francis]

On Wed, Dec 13, 2023 at 5:49 PM Akihiko Odaki <akihiko.odaki@daynix.com> wrote:
>
> This function is no longer used.
>
> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Acked-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  include/hw/core/cpu.h |  4 ----
>  target/arm/cpu.h      |  6 ------
>  target/ppc/cpu.h      |  1 -
>  target/arm/cpu.c      |  1 -
>  target/arm/gdbstub.c  | 18 ------------------
>  target/ppc/cpu_init.c |  3 ---
>  target/ppc/gdbstub.c  | 10 ----------
>  target/riscv/cpu.c    | 14 --------------
>  8 files changed, 57 deletions(-)
>
> diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
> index a6214610603f..17f99adc0f41 100644
> --- a/include/hw/core/cpu.h
> +++ b/include/hw/core/cpu.h
> @@ -134,9 +134,6 @@ struct SysemuCPUOps;
>   *           before the insn which triggers a watchpoint rather than after 
> it.
>   * @gdb_arch_name: Optional callback that returns the architecture name known
>   * to GDB. The caller must free the returned string with g_free.
> - * @gdb_get_dynamic_xml: Callback to return dynamically generated XML for the
> - *   gdb stub. Returns a pointer to the XML contents for the specified XML 
> file
> - *   or NULL if the CPU doesn't have a dynamically generated content for it.
>   * @disas_set_info: Setup architecture specific components of disassembly 
> info
>   * @adjust_watchpoint_address: Perform a target-specific adjustment to an
>   * address before attempting to match it against watchpoints.
> @@ -167,7 +164,6 @@ struct CPUClass {
>
>      const char *gdb_core_xml_file;
>      const gchar * (*gdb_arch_name)(CPUState *cpu);
> -    const char * (*gdb_get_dynamic_xml)(CPUState *cpu, const char *xmlname);
>
>      void (*disas_set_info)(CPUState *cpu, disassemble_info *info);
>
> diff --git a/target/arm/cpu.h b/target/arm/cpu.h
> index b2f8ac81f06c..c8e77440f0f7 100644
> --- a/target/arm/cpu.h
> +++ b/target/arm/cpu.h
> @@ -1182,12 +1182,6 @@ hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState 
> *cpu, vaddr addr,
>  int arm_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg);
>  int arm_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
>
> -/* Returns the dynamically generated XML for the gdb stub.
> - * Returns a pointer to the XML contents for the specified XML file or NULL
> - * if the XML name doesn't match the predefined one.
> - */
> -const char *arm_gdb_get_dynamic_xml(CPUState *cpu, const char *xmlname);
> -
>  int arm_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
>                               int cpuid, DumpState *s);
>  int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
> diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> index f87c26f98a67..9f94282e13e9 100644
> --- a/target/ppc/cpu.h
> +++ b/target/ppc/cpu.h
> @@ -1524,7 +1524,6 @@ int ppc_cpu_gdb_write_register(CPUState *cpu, uint8_t 
> *buf, int reg);
>  int ppc_cpu_gdb_write_register_apple(CPUState *cpu, uint8_t *buf, int reg);
>  #ifndef CONFIG_USER_ONLY
>  hwaddr ppc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
> -const char *ppc_gdb_get_dynamic_xml(CPUState *cs, const char *xml_name);
>  #endif
>  int ppc64_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
>                                 int cpuid, DumpState *s);
> diff --git a/target/arm/cpu.c b/target/arm/cpu.c
> index efcc22b1446c..304538cca52a 100644
> --- a/target/arm/cpu.c
> +++ b/target/arm/cpu.c
> @@ -2499,7 +2499,6 @@ static void arm_cpu_class_init(ObjectClass *oc, void 
> *data)
>      cc->sysemu_ops = &arm_sysemu_ops;
>  #endif
>      cc->gdb_arch_name = arm_gdb_arch_name;
> -    cc->gdb_get_dynamic_xml = arm_gdb_get_dynamic_xml;
>      cc->gdb_stop_before_watchpoint = true;
>      cc->disas_set_info = arm_disas_set_info;
>
> diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c
> index 059d84f98e52..a3bb73cfa7ce 100644
> --- a/target/arm/gdbstub.c
> +++ b/target/arm/gdbstub.c
> @@ -474,24 +474,6 @@ static GDBFeature 
> *arm_gen_dynamic_m_secextreg_feature(CPUState *cs,
>  #endif
>  #endif /* CONFIG_TCG */
>
> -const char *arm_gdb_get_dynamic_xml(CPUState *cs, const char *xmlname)
> -{
> -    ARMCPU *cpu = ARM_CPU(cs);
> -
> -    if (strcmp(xmlname, "system-registers.xml") == 0) {
> -        return cpu->dyn_sysreg_feature.desc.xml;
> -    } else if (strcmp(xmlname, "sve-registers.xml") == 0) {
> -        return cpu->dyn_svereg_feature.desc.xml;
> -    } else if (strcmp(xmlname, "arm-m-system.xml") == 0) {
> -        return cpu->dyn_m_systemreg_feature.desc.xml;
> -#ifndef CONFIG_USER_ONLY
> -    } else if (strcmp(xmlname, "arm-m-secext.xml") == 0) {
> -        return cpu->dyn_m_secextreg_feature.desc.xml;
> -#endif
> -    }
> -    return NULL;
> -}
> -
>  void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)
>  {
>      CPUState *cs = CPU(cpu);
> diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
> index a0178c3ce80a..909d753b0221 100644
> --- a/target/ppc/cpu_init.c
> +++ b/target/ppc/cpu_init.c
> @@ -7380,9 +7380,6 @@ static void ppc_cpu_class_init(ObjectClass *oc, void 
> *data)
>  #endif
>
>      cc->gdb_num_core_regs = 71;
> -#ifndef CONFIG_USER_ONLY
> -    cc->gdb_get_dynamic_xml = ppc_gdb_get_dynamic_xml;
> -#endif
>  #ifdef USE_APPLE_GDB
>      cc->gdb_read_register = ppc_cpu_gdb_read_register_apple;
>      cc->gdb_write_register = ppc_cpu_gdb_write_register_apple;
> diff --git a/target/ppc/gdbstub.c b/target/ppc/gdbstub.c
> index 8ca37b6bf952..f47878a67bd1 100644
> --- a/target/ppc/gdbstub.c
> +++ b/target/ppc/gdbstub.c
> @@ -342,16 +342,6 @@ static void gdb_gen_spr_feature(CPUState *cs)
>
>      gdb_feature_builder_end(&builder);
>  }
> -
> -const char *ppc_gdb_get_dynamic_xml(CPUState *cs, const char *xml_name)
> -{
> -    PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cs);
> -
> -    if (strcmp(xml_name, "power-spr.xml") == 0) {
> -        return pcc->gdb_spr.xml;
> -    }
> -    return NULL;
> -}
>  #endif
>
>  #if !defined(CONFIG_USER_ONLY)
> diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
> index a3a98230ca87..1e3ac556b33e 100644
> --- a/target/riscv/cpu.c
> +++ b/target/riscv/cpu.c
> @@ -1529,19 +1529,6 @@ static const gchar *riscv_gdb_arch_name(CPUState *cs)
>      }
>  }
>
> -static const char *riscv_gdb_get_dynamic_xml(CPUState *cs, const char 
> *xmlname)
> -{
> -    RISCVCPU *cpu = RISCV_CPU(cs);
> -
> -    if (strcmp(xmlname, "riscv-csr.xml") == 0) {
> -        return cpu->dyn_csr_feature.xml;
> -    } else if (strcmp(xmlname, "riscv-vector.xml") == 0) {
> -        return cpu->dyn_vreg_feature.xml;
> -    }
> -
> -    return NULL;
> -}
> -
>  #ifndef CONFIG_USER_ONLY
>  static int64_t riscv_get_arch_id(CPUState *cs)
>  {
> @@ -1695,7 +1682,6 @@ static void riscv_cpu_common_class_init(ObjectClass *c, 
> void *data)
>      cc->get_arch_id = riscv_get_arch_id;
>  #endif
>      cc->gdb_arch_name = riscv_gdb_arch_name;
> -    cc->gdb_get_dynamic_xml = riscv_gdb_get_dynamic_xml;
>
>      object_class_property_add(c, "mvendorid", "uint32", cpu_get_mvendorid,
>                                cpu_set_mvendorid, NULL, NULL);
>
> --
> 2.43.0
>
>