Commit 09f71b05 authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

arm: virt: Parse cpu_model only once 



Considering that features are converted to global properties and
global properties are automatically applied to every new instance
of created CPU (at object_new() time), there is no point in
parsing cpu_model string every time a CPU created. So move
parsing outside CPU creation loop and do it only once.

Parsing also should be done before any CPU is created so that
features would affect the first CPU a well.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 62a48a2a

hw/arm/virt.c

+21 −21
Original line number Diff line number Diff line
@@ -1176,6 +1176,10 @@ static void machvirt_init(MachineState *machine) 
    VirtGuestInfoState *guest_info_state = g_malloc0(sizeof *guest_info_state);

    VirtGuestInfo *guest_info = &guest_info_state->info;

    char **cpustr;

    ObjectClass *oc;

    const char *typename;

    CPUClass *cc;

    Error *err = NULL;

    bool firmware_loaded = bios_name || drive_get(IF_PFLASH, 0, 0);



    if (!cpu_model) {
@@ -1259,28 +1263,25 @@ static void machvirt_init(MachineState *machine) 


    create_fdt(vbi);



    for (n = 0; n < smp_cpus; n++) {

        ObjectClass *oc = cpu_class_by_name(TYPE_ARM_CPU, cpustr[0]);

        const char *typename = object_class_get_name(oc);

        CPUClass *cc = CPU_CLASS(oc);

        Object *cpuobj;

        Error *err = NULL;

        char *cpuopts = g_strdup(cpustr[1]);



    oc = cpu_class_by_name(TYPE_ARM_CPU, cpustr[0]);

    if (!oc) {

        error_report("Unable to find CPU definition");

        exit(1);

    }

        /* convert -smp CPU options specified by the user into global props */

        cc->parse_features(typename, cpuopts, &err);

        cpuobj = object_new(typename);

    typename = object_class_get_name(oc);



        g_free(cpuopts);

    /* convert -smp CPU options specified by the user into global props */

    cc = CPU_CLASS(oc);

    cc->parse_features(typename, cpustr[1], &err);

    g_strfreev(cpustr);

    if (err) {

        error_report_err(err);

        exit(1);

    }



    for (n = 0; n < smp_cpus; n++) {

        Object *cpuobj = object_new(typename);



        if (!vms->secure) {

            object_property_set_bool(cpuobj, false, "has_el3", NULL);

        }
@@ -1310,7 +1311,6 @@ static void machvirt_init(MachineState *machine) 


        object_property_set_bool(cpuobj, true, "realized", NULL);

    }

    g_strfreev(cpustr);

    fdt_add_timer_nodes(vbi, gic_version);

    fdt_add_cpu_nodes(vbi);

    fdt_add_psci_node(vbi);

qom/cpu.c

+0 −1
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ static void cpu_common_parse_features(const char *typename, char *features, 
     * call it only once, so we can remove this check (or change it

     * to assert(!cpu_globals_initialized).

     * Current callers of ->parse_features() are:

     * - machvirt_init()

     * - cpu_generic_init()

     * - cpu_x86_create()

     */