mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unicore32: use generic cpu_model parsing

Browse Source 
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1507211474-188400-29-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2017-10-05 15:51:02 +02:00 committed by Eduardo Habkost
parent 6a82686647
commit 1aaa63193b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/unicore32/puv3.c
View File

@ -112,7 +112,6 @@ static void puv3_load_kernel(const char *kernel_filename)
static void puv3_init(MachineState *machine) static void puv3_init(MachineState *machine)
{ {
ram_addr_t ram_size = machine->ram_size; ram_addr_t ram_size = machine->ram_size;
const char *cpu_model = machine->cpu_model;
const char *kernel_filename = machine->kernel_filename; const char *kernel_filename = machine->kernel_filename;
const char *initrd_filename = machine->initrd_filename; const char *initrd_filename = machine->initrd_filename;
CPUUniCore32State *env; CPUUniCore32State *env;
@ -123,11 +122,7 @@ static void puv3_init(MachineState *machine)
exit(1); exit(1);
} }
if (!cpu_model) { cpu = UNICORE32_CPU(cpu_create(machine->cpu_type));
cpu_model = "UniCore-II";
}
cpu = UNICORE32_CPU(cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model));
env = &cpu->env; env = &cpu->env;
puv3_soc_init(env); puv3_soc_init(env);
@ -140,6 +135,7 @@ static void puv3_machine_init(MachineClass *mc)
mc->desc = "PKUnity Version-3 based on UniCore32"; mc->desc = "PKUnity Version-3 based on UniCore32";
mc->init = puv3_init; mc->init = puv3_init;
mc->is_default = 1; mc->is_default = 1;
mc->default_cpu_type = UNICORE32_CPU_TYPE_NAME("UniCore-II");
} }
DEFINE_MACHINE("puv3", puv3_machine_init) DEFINE_MACHINE("puv3", puv3_machine_init)