Commit 2278b939 authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

Use cpu_create(type) instead of cpu_init(cpu_model) 



With all targets defining CPU_RESOLVING_TYPE, refactor
cpu_parse_cpu_model(type, cpu_model) to parse_cpu_model(cpu_model)
so that callers won't have to know internal resolving cpu
type. Place it in exec.c so it could be called from both
target independed vl.c and *-user/main.c.

That allows us to stop abusing cpu type from
  MachineClass::default_cpu_type
as resolver class in vl.c which were confusing part of
cpu_parse_cpu_model().

Also with new parse_cpu_model(), the last users of cpu_init()
in null-machine.c and bsd/linux-user targets could be switched
to cpu_create() API and cpu_init() API will be removed by
follow up patch.

With no longer users left remove MachineState::cpu_model field,
new code should use MachineState::cpu_type instead and
leave cpu_model parsing to generic code in vl.c.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <1518000027-274608-5-git-send-email-imammedo@redhat.com>
[ehabkost: Fix bsd-user build error]
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 0dacec87

bsd-user/main.c

+3 −1
Original line number Diff line number Diff line
@@ -723,6 +723,7 @@ int main(int argc, char **argv) 
{

    const char *filename;

    const char *cpu_model;

    const char *cpu_type;

    const char *log_file = NULL;

    const char *log_mask = NULL;

    struct target_pt_regs regs1, *regs = &regs1;
@@ -900,7 +901,8 @@ int main(int argc, char **argv) 
    tcg_exec_init(0);

    /* NOTE: we need to init the CPU at this stage to get

       qemu_host_page_size */

    cpu = cpu_init(cpu_model);

    cpu_type = parse_cpu_model(cpu_model);

    cpu = cpu_create(cpu_type);

    env = cpu->env_ptr;

#if defined(TARGET_SPARC) || defined(TARGET_PPC)

    cpu_reset(cpu);

exec.c

+23 −0
Original line number Diff line number Diff line
@@ -817,6 +817,29 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp) 
#endif

}



const char *parse_cpu_model(const char *cpu_model)

{

    ObjectClass *oc;

    CPUClass *cc;

    gchar **model_pieces;

    const char *cpu_type;



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



    oc = cpu_class_by_name(CPU_RESOLVING_TYPE, model_pieces[0]);

    if (oc == NULL) {

        error_report("unable to find CPU model '%s'", model_pieces[0]);

        g_strfreev(model_pieces);

        exit(EXIT_FAILURE);

    }



    cpu_type = object_class_get_name(oc);

    cc = CPU_CLASS(oc);

    cc->parse_features(cpu_type, model_pieces[1], &error_fatal);

    g_strfreev(model_pieces);

    return cpu_type;

}



#if defined(CONFIG_USER_ONLY)

static void breakpoint_invalidate(CPUState *cpu, target_ulong pc)

{

hw/core/null-machine.c

+3 −3
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ static void machine_none_init(MachineState *mch) 
{

    CPUState *cpu = NULL;



    /* Initialize CPU (if a model has been specified) */

    if (mch->cpu_model) {

        cpu = cpu_init(mch->cpu_model);

    /* Initialize CPU (if user asked for it) */

    if (mch->cpu_type) {

        cpu = cpu_create(mch->cpu_type);

        if (!cpu) {

            error_report("Unable to initialize CPU");

            exit(1);

include/hw/boards.h

+0 −1
Original line number Diff line number Diff line
@@ -252,7 +252,6 @@ struct MachineState { 
    char *kernel_filename;

    char *kernel_cmdline;

    char *initrd_filename;

    const char *cpu_model;

    const char *cpu_type;

    AccelState *accelerator;

    CPUArchIdList *possible_cpus;

include/qom/cpu.h

+2 −14
Original line number Diff line number Diff line
@@ -662,8 +662,7 @@ ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model); 
CPUState *cpu_create(const char *typename);



/**

 * cpu_parse_cpu_model:

 * @typename: The CPU base type or CPU type.

 * parse_cpu_model:

 * @cpu_model: The model string including optional parameters.

 *

 * processes optional parameters and registers them as global properties
@@ -671,18 +670,7 @@ CPUState *cpu_create(const char *typename); 
 * Returns: type of CPU to create or prints error and terminates process

 *          if an error occurred.

 */

const char *cpu_parse_cpu_model(const char *typename, const char *cpu_model);



/**

 * cpu_generic_init:

 * @typename: The CPU base type.

 * @cpu_model: The model string including optional parameters.

 *

 * Instantiates a CPU, processes optional parameters and realizes the CPU.

 *

 * Returns: A #CPUState or %NULL if an error occurred.

 */

CPUState *cpu_generic_init(const char *typename, const char *cpu_model);

const char *parse_cpu_model(const char *cpu_model);



/**

 * cpu_has_work: