[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 31/39] sparc: leon3: use generic cpu_model parsing
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL v2 31/39] sparc: leon3: use generic cpu_model parsing |
Date: |
Fri, 27 Oct 2017 16:20:59 +0200 |
From: Igor Mammedov <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Artyom Tarasenko <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/sparc/leon3.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index ec2816bf94..8c66d5af24 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -107,7 +107,6 @@ static void leon3_set_pil_in(void *opaque, uint32_t pil_in)
static void leon3_generic_hw_init(MachineState *machine)
{
ram_addr_t ram_size = machine->ram_size;
- const char *cpu_model = machine->cpu_model;
const char *kernel_filename = machine->kernel_filename;
SPARCCPU *cpu;
CPUSPARCState *env;
@@ -122,11 +121,7 @@ static void leon3_generic_hw_init(MachineState *machine)
ResetData *reset_info;
/* Init CPU */
- if (!cpu_model) {
- cpu_model = "LEON3";
- }
-
- cpu = SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model));
+ cpu = SPARC_CPU(cpu_create(machine->cpu_type));
env = &cpu->env;
cpu_sparc_set_id(env, 0);
@@ -222,6 +217,7 @@ static void leon3_generic_machine_init(MachineClass *mc)
{
mc->desc = "Leon-3 generic";
mc->init = leon3_generic_hw_init;
+ mc->default_cpu_type = SPARC_CPU_TYPE_NAME("LEON3");
}
DEFINE_MACHINE("leon3_generic", leon3_generic_machine_init)
--
2.13.6
- [Qemu-devel] [PULL v2 21/39] xtensa: cleanup cpu type name composition, (continued)
- [Qemu-devel] [PULL v2 21/39] xtensa: cleanup cpu type name composition, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 22/39] xtensa: sim: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 23/39] xtensa: lx60/lx200/ml605/kc705: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 24/39] unicore32: cleanup cpu type name composition, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 25/39] unicore32: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 27/39] tricore: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 26/39] tricore: cleanup cpu type name composition, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 28/39] sparc: cleanup cpu type name composition, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 29/39] sparc: sun4u/sun4v/niagara: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 30/39] sparc: sparc: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 31/39] sparc: leon3: use generic cpu_model parsing,
Eduardo Habkost <=
- [Qemu-devel] [PULL v2 32/39] mips: use object_new() instead of gnew()+object_initialize(), Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 33/39] mips: malta/boston: replace cpu_model with cpu_type, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 34/39] mips: fulong2e: replace cpu_model with cpu_type, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 35/39] mips: Magnum/Acer Pica 61: replace cpu_model with cpu_type, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 36/39] mips: mipssim: replace cpu_model with cpu_type, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 37/39] mips: r4k: replace cpu_model with cpu_type, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 38/39] numa: fixup parsed NumaNodeOptions earlier, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 39/39] x86: Skip check apic_id_limit for Xen, Eduardo Habkost, 2017/10/27
- Re: [Qemu-devel] [PULL v2 00/39] x86/cpu/numa queue, 2017-10-27, Peter Maydell, 2017/10/30