Commit 2d64255b authored by Andreas Färber's avatar Andreas Färber
Browse files

target-i386: Split command line parsing out of cpu_x86_register() 



In order to instantiate a CPU subtype we will need to know which type,
so move the cpu_model splitting into cpu_x86_init().

Parameters need to be set on the X86CPU instance, so move
cpu_x86_parse_featurestr() into cpu_x86_init() as well.

This leaves cpu_x86_register() operating on the model name only.

Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 5c3c6a68

hw/pc.c

+0 −1
Original line number Diff line number Diff line
@@ -876,7 +876,6 @@ void pc_cpus_init(const char *cpu_model) 


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

        if (!cpu_x86_init(cpu_model)) {

            fprintf(stderr, "Unable to find x86 CPU definition\n");

            exit(1);

        }

    }

target-i386/cpu.c

+40 −40
Original line number Diff line number Diff line
@@ -1516,27 +1516,16 @@ static void filter_features_for_kvm(X86CPU *cpu) 
}

#endif



static int cpu_x86_register(X86CPU *cpu, const char *cpu_model)

static void cpu_x86_register(X86CPU *cpu, const char *name, Error **errp)

{

    CPUX86State *env = &cpu->env;

    x86_def_t def1, *def = &def1;

    Error *error = NULL;

    char *name, *features;

    gchar **model_pieces;



    memset(def, 0, sizeof(*def));



    model_pieces = g_strsplit(cpu_model, ",", 2);

    if (!model_pieces[0]) {

        error_setg(&error, "Invalid/empty CPU model name");

        goto out;

    }

    name = model_pieces[0];

    features = model_pieces[1];



    if (cpu_x86_find_by_name(def, name) < 0) {

        error_setg(&error, "Unable to find CPU definition: %s", name);

        goto out;

        error_setg(errp, "Unable to find CPU definition: %s", name);

        return;

    }



    if (kvm_enabled()) {
@@ -1544,58 +1533,69 @@ static int cpu_x86_register(X86CPU *cpu, const char *cpu_model) 
    }

    def->ext_features |= CPUID_EXT_HYPERVISOR;



    object_property_set_str(OBJECT(cpu), def->vendor, "vendor", &error);

    object_property_set_int(OBJECT(cpu), def->level, "level", &error);

    object_property_set_int(OBJECT(cpu), def->family, "family", &error);

    object_property_set_int(OBJECT(cpu), def->model, "model", &error);

    object_property_set_int(OBJECT(cpu), def->stepping, "stepping", &error);

    object_property_set_str(OBJECT(cpu), def->vendor, "vendor", errp);

    object_property_set_int(OBJECT(cpu), def->level, "level", errp);

    object_property_set_int(OBJECT(cpu), def->family, "family", errp);

    object_property_set_int(OBJECT(cpu), def->model, "model", errp);

    object_property_set_int(OBJECT(cpu), def->stepping, "stepping", errp);

    env->cpuid_features = def->features;

    env->cpuid_ext_features = def->ext_features;

    env->cpuid_ext2_features = def->ext2_features;

    env->cpuid_ext3_features = def->ext3_features;

    object_property_set_int(OBJECT(cpu), def->xlevel, "xlevel", &error);

    object_property_set_int(OBJECT(cpu), def->xlevel, "xlevel", errp);

    env->cpuid_kvm_features = def->kvm_features;

    env->cpuid_svm_features = def->svm_features;

    env->cpuid_ext4_features = def->ext4_features;

    env->cpuid_7_0_ebx_features = def->cpuid_7_0_ebx_features;

    env->cpuid_xlevel2 = def->xlevel2;



    object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error);

    if (error) {

        goto out;

    }



    cpu_x86_parse_featurestr(cpu, features, &error);

out:

    g_strfreev(model_pieces);

    if (error) {

        fprintf(stderr, "%s\n", error_get_pretty(error));

        error_free(error);

        return -1;

    }

    return 0;

    object_property_set_str(OBJECT(cpu), def->model_id, "model-id", errp);

}



X86CPU *cpu_x86_init(const char *cpu_model)

{

    X86CPU *cpu;

    X86CPU *cpu = NULL;

    CPUX86State *env;

    gchar **model_pieces;

    char *name, *features;

    Error *error = NULL;



    model_pieces = g_strsplit(cpu_model, ",", 2);

    if (!model_pieces[0]) {

        error_setg(&error, "Invalid/empty CPU model name");

        goto out;

    }

    name = model_pieces[0];

    features = model_pieces[1];



    cpu = X86_CPU(object_new(TYPE_X86_CPU));

    env = &cpu->env;

    env->cpu_model_str = cpu_model;



    if (cpu_x86_register(cpu, cpu_model) < 0) {

        object_unref(OBJECT(cpu));

        return NULL;

    cpu_x86_register(cpu, name, &error);

    if (error) {

        goto out;

    }



    cpu_x86_parse_featurestr(cpu, features, &error);

    if (error) {

        goto out;

    }



    object_property_set_bool(OBJECT(cpu), true, "realized", &error);

    if (error) {

        goto out;

    }



out:

    g_strfreev(model_pieces);

    if (error) {

        fprintf(stderr, "%s\n", error_get_pretty(error));

        error_free(error);

        if (cpu != NULL) {

            object_unref(OBJECT(cpu));

        return NULL;

            cpu = NULL;

        }

    }

    return cpu;

}