[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [Qemu-devel] [PATCH 11/23] ppc: spapr: replace ppc_cpu_pa
From: |
Greg Kurz |
Subject: |
Re: [Qemu-ppc] [Qemu-devel] [PATCH 11/23] ppc: spapr: replace ppc_cpu_parse_features() with cpu_parse_cpu_model() |
Date: |
Thu, 5 Oct 2017 20:35:28 +0200 |
On Thu, 5 Oct 2017 18:24:38 +0200
Igor Mammedov <address@hidden> wrote:
> ppc_cpu_parse_features() is doing practically the same thing as
> generic cpu_parse_cpu_model(). So remove duplicated impl. and
> reuse generic one.
>
> Signed-off-by: Igor Mammedov <address@hidden>
> ---
Reviewed-by: Greg Kurz <address@hidden>
> include/hw/ppc/ppc.h | 2 --
> hw/ppc/ppc.c | 25 -------------------------
> hw/ppc/spapr_cpu_core.c | 9 ++++-----
> 3 files changed, 4 insertions(+), 32 deletions(-)
>
> diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h
> index 4e7fe11..ff0ac30 100644
> --- a/include/hw/ppc/ppc.h
> +++ b/include/hw/ppc/ppc.h
> @@ -105,6 +105,4 @@ enum {
>
> /* ppc_booke.c */
> void ppc_booke_timers_init(PowerPCCPU *cpu, uint32_t freq, uint32_t flags);
> -
> -void ppc_cpu_parse_features(const char *cpu_model);
> #endif
> diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c
> index 05da316..7ec35de 100644
> --- a/hw/ppc/ppc.c
> +++ b/hw/ppc/ppc.c
> @@ -1359,28 +1359,3 @@ void PPC_debug_write (void *opaque, uint32_t addr,
> uint32_t val)
> break;
> }
> }
> -
> -void ppc_cpu_parse_features(const char *cpu_model)
> -{
> - CPUClass *cc;
> - ObjectClass *oc;
> - const char *typename;
> - gchar **model_pieces;
> -
> - model_pieces = g_strsplit(cpu_model, ",", 2);
> - if (!model_pieces[0]) {
> - error_report("Invalid/empty CPU model name");
> - exit(1);
> - }
> -
> - oc = cpu_class_by_name(TYPE_POWERPC_CPU, model_pieces[0]);
> - if (oc == NULL) {
> - error_report("Unable to find CPU definition: %s", model_pieces[0]);
> - exit(1);
> - }
> -
> - typename = object_class_get_name(oc);
> - cc = CPU_CLASS(oc);
> - cc->parse_features(typename, model_pieces[1], &error_fatal);
> - g_strfreev(model_pieces);
> -}
> diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
> index 3e20b1d..3dea5ff 100644
> --- a/hw/ppc/spapr_cpu_core.c
> +++ b/hw/ppc/spapr_cpu_core.c
> @@ -34,6 +34,7 @@ void spapr_cpu_parse_features(sPAPRMachineState *spapr)
> * before passing it on to the cpu level parser.
> */
> gchar **inpieces;
> + gchar *newprops;
> int i, j;
> gchar *compat_str = NULL;
>
> @@ -58,17 +59,15 @@ void spapr_cpu_parse_features(sPAPRMachineState *spapr)
>
> if (compat_str) {
> char *val = compat_str + strlen("compat=");
> - gchar *newprops = g_strjoinv(",", inpieces);
>
> object_property_set_str(OBJECT(spapr), val, "max-cpu-compat",
> &error_fatal);
>
> - ppc_cpu_parse_features(newprops);
> - g_free(newprops);
> - } else {
> - ppc_cpu_parse_features(MACHINE(spapr)->cpu_model);
> }
>
> + newprops = g_strjoinv(",", inpieces);
> + cpu_parse_cpu_model(TYPE_POWERPC_CPU, newprops);
> + g_free(newprops);
> g_strfreev(inpieces);
> }
>
- Re: [Qemu-ppc] [PATCH 05/23] ppc: mac_newworld: use generic cpu_model parsing, (continued)
- [Qemu-ppc] [PATCH 09/23] ppc: virtex-ml507: replace cpu_model with cpu_type, Igor Mammedov, 2017/10/05
- [Qemu-ppc] [PATCH 06/23] ppc: mac_oldworld: use generic cpu_model parsing, Igor Mammedov, 2017/10/05
- [Qemu-ppc] [PATCH 07/23] ppc: bamboo: use generic cpu_model parsing, Igor Mammedov, 2017/10/05
- [Qemu-ppc] [PATCH 08/23] ppc: replace cpu_model with cpu_type on ref405ep, taihu boards, Igor Mammedov, 2017/10/05
- [Qemu-ppc] [PATCH 11/23] ppc: spapr: replace ppc_cpu_parse_features() with cpu_parse_cpu_model(), Igor Mammedov, 2017/10/05
- [Qemu-ppc] [PATCH 14/23] ppc: spapr: use cpu type name directly, Igor Mammedov, 2017/10/05
- [Qemu-ppc] [PATCH 15/23] ppc: spapr: register 'host' core type along with the rest of core types, Igor Mammedov, 2017/10/05
- [Qemu-ppc] [PATCH 13/23] ppc: spapr: define core types statically, Igor Mammedov, 2017/10/05