Commit 7f833247 authored by Igor Mammedov's avatar Igor Mammedov Committed by Andreas Färber
Browse files

target-i386: Split out CPU creation and features parsing 



Move CPU creation and features parsing into a separate cpu_x86_create()
function, so that board would be able to set board-specific CPU
properties before CPU is realized.

Keep cpu_x86_init() for compatibility with the code that uses cpu_init()
and doesn't need to modify CPU properties.

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 dd13e088

target-i386/cpu.c

+15 −3
Original line number Diff line number Diff line
@@ -1563,7 +1563,7 @@ static void cpu_x86_register(X86CPU *cpu, const char *name, Error **errp) 
    object_property_set_str(OBJECT(cpu), def->model_id, "model-id", errp);

}



X86CPU *cpu_x86_init(const char *cpu_model)

X86CPU *cpu_x86_create(const char *cpu_model, Error **errp)

{

    X86CPU *cpu = NULL;

    CPUX86State *env;
@@ -1593,13 +1593,25 @@ X86CPU *cpu_x86_init(const char *cpu_model) 
        goto out;

    }



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

out:

    error_propagate(errp, error);

    g_strfreev(model_pieces);

    return cpu;

}



X86CPU *cpu_x86_init(const char *cpu_model)

{

    Error *error = NULL;

    X86CPU *cpu;



    cpu = cpu_x86_create(cpu_model, &error);

    if (error) {

        goto out;

    }



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



out:

    g_strfreev(model_pieces);

    if (error) {

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

        error_free(error);

target-i386/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -896,6 +896,7 @@ typedef struct CPUX86State { 
#include "cpu-qom.h"



X86CPU *cpu_x86_init(const char *cpu_model);

X86CPU *cpu_x86_create(const char *cpu_model, Error **errp);

int cpu_x86_exec(CPUX86State *s);

void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf);

void x86_cpudef_setup(void);