[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-arm] [Qemu-devel] [PATCH 21/28] arm: replace cpu_arm_init() wi
From: |
Andrew Jones |
Subject: |
Re: [Qemu-arm] [Qemu-devel] [PATCH 21/28] arm: replace cpu_arm_init() with cpu_generic_init() |
Date: |
Mon, 14 Aug 2017 10:53:23 +0200 |
User-agent: |
Mutt/1.6.0.1 (2016-04-01) |
On Fri, Jul 14, 2017 at 03:52:12PM +0200, Igor Mammedov wrote:
> it's just a wrapper, drop it and use cpu_generic_init() directly
>
> Signed-off-by: Igor Mammedov <address@hidden>
> ---
> CC: Jan Kiszka <address@hidden>
> CC: Peter Maydell <address@hidden>
> CC: Andrzej Zaborowski <address@hidden>
> CC: address@hidden
> ---
> target/arm/cpu.h | 3 +--
> hw/arm/musicpal.c | 2 +-
> hw/arm/omap1.c | 2 +-
> hw/arm/omap2.c | 2 +-
> hw/arm/pxa2xx.c | 4 ++--
> hw/arm/strongarm.c | 2 +-
> target/arm/helper.c | 5 -----
> 7 files changed, 7 insertions(+), 13 deletions(-)
>
> diff --git a/target/arm/cpu.h b/target/arm/cpu.h
> index 16a1e59..c9be0ac 100644
> --- a/target/arm/cpu.h
> +++ b/target/arm/cpu.h
> @@ -746,7 +746,6 @@ int aarch64_cpu_gdb_read_register(CPUState *cpu, uint8_t
> *buf, int reg);
> int aarch64_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
> #endif
>
> -ARMCPU *cpu_arm_init(const char *cpu_model);
> target_ulong do_arm_semihosting(CPUARMState *env);
> void aarch64_sync_32_to_64(CPUARMState *env);
> void aarch64_sync_64_to_32(CPUARMState *env);
> @@ -1999,7 +1998,7 @@ static inline bool arm_excp_unmasked(CPUState *cs,
> unsigned int excp_idx,
> return unmasked || pstate_unmasked;
> }
>
> -#define cpu_init(cpu_model) CPU(cpu_arm_init(cpu_model))
> +#define cpu_init(cpu_model) cpu_generic_init(TYPE_ARM_CPU, cpu_model)
>
> #define cpu_signal_handler cpu_arm_signal_handler
> #define cpu_list arm_cpu_list
> diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
> index 9c710f7..0d519f9 100644
> --- a/hw/arm/musicpal.c
> +++ b/hw/arm/musicpal.c
> @@ -1593,7 +1593,7 @@ static void musicpal_init(MachineState *machine)
> if (!cpu_model) {
> cpu_model = "arm926";
> }
> - cpu = cpu_arm_init(cpu_model);
> + cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, cpu_model));
> if (!cpu) {
> fprintf(stderr, "Unable to find CPU definition\n");
> exit(1);
> diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
> index 54582bd..391eb28 100644
> --- a/hw/arm/omap1.c
> +++ b/hw/arm/omap1.c
> @@ -3863,7 +3863,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion
> *system_memory,
>
> /* Core */
> s->mpu_model = omap310;
> - s->cpu = cpu_arm_init(core);
> + s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, core));
> if (s->cpu == NULL) {
> fprintf(stderr, "Unable to find CPU definition\n");
> exit(1);
> diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
> index 91f5733..a20bb1f 100644
> --- a/hw/arm/omap2.c
> +++ b/hw/arm/omap2.c
> @@ -2261,7 +2261,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion
> *sysmem,
>
> /* Core */
> s->mpu_model = omap2420;
> - s->cpu = cpu_arm_init(core ?: "arm1136-r2");
> + s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, core ?: "arm1136-r2"));
> if (s->cpu == NULL) {
> fprintf(stderr, "Unable to find CPU definition\n");
> exit(1);
> diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
> index 629e6c6..2f1c141 100644
> --- a/hw/arm/pxa2xx.c
> +++ b/hw/arm/pxa2xx.c
> @@ -2065,7 +2065,7 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space,
> if (!revision)
> revision = "pxa270";
>
> - s->cpu = cpu_arm_init(revision);
> + s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, revision));
> if (s->cpu == NULL) {
> fprintf(stderr, "Unable to find CPU definition\n");
> exit(1);
> @@ -2197,7 +2197,7 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space,
> unsigned int sdram_size)
>
> s = g_new0(PXA2xxState, 1);
>
> - s->cpu = cpu_arm_init("pxa255");
> + s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, "pxa255"));
> if (s->cpu == NULL) {
> fprintf(stderr, "Unable to find CPU definition\n");
> exit(1);
> diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
> index 7683edc..a27d7c8 100644
> --- a/hw/arm/strongarm.c
> +++ b/hw/arm/strongarm.c
> @@ -1597,7 +1597,7 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem,
> exit(1);
> }
>
> - s->cpu = cpu_arm_init(rev);
> + s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, rev));
>
> if (!s->cpu) {
> error_report("Unable to find CPU definition");
> diff --git a/target/arm/helper.c b/target/arm/helper.c
> index 2594faa..86e69a6 100644
> --- a/target/arm/helper.c
> +++ b/target/arm/helper.c
> @@ -5237,11 +5237,6 @@ void register_cp_regs_for_features(ARMCPU *cpu)
> }
> }
>
> -ARMCPU *cpu_arm_init(const char *cpu_model)
> -{
> - return ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, cpu_model));
> -}
> -
> void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)
> {
> CPUState *cs = CPU(cpu);
> --
> 2.7.4
>
>
I agree with the motivation described in the cover letter and the changes
(which are even mostly verified by the compiler) look good to me.
Reviewed-by: Andrew Jones <address@hidden>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-arm] [Qemu-devel] [PATCH 21/28] arm: replace cpu_arm_init() with cpu_generic_init(),
Andrew Jones <=