[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 22/39] xtensa: sim: use generic cpu_model parsing
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 22/39] xtensa: sim: use generic cpu_model parsing |
Date: |
Thu, 26 Oct 2017 16:03:47 +0200 |
From: Igor Mammedov <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/xtensa/sim.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
index b3580b11fa..2bb883b664 100644
--- a/hw/xtensa/sim.c
+++ b/hw/xtensa/sim.c
@@ -75,16 +75,11 @@ static void xtensa_sim_init(MachineState *machine)
XtensaCPU *cpu = NULL;
CPUXtensaState *env = NULL;
ram_addr_t ram_size = machine->ram_size;
- const char *cpu_model = machine->cpu_model;
const char *kernel_filename = machine->kernel_filename;
int n;
- if (!cpu_model) {
- cpu_model = XTENSA_DEFAULT_CPU_MODEL;
- }
-
for (n = 0; n < smp_cpus; n++) {
- cpu = XTENSA_CPU(cpu_generic_init(TYPE_XTENSA_CPU, cpu_model));
+ cpu = XTENSA_CPU(cpu_create(machine->cpu_type));
env = &cpu->env;
env->sregs[PRID] = n;
@@ -133,6 +128,7 @@ static void xtensa_sim_machine_init(MachineClass *mc)
mc->init = xtensa_sim_init;
mc->max_cpus = 4;
mc->no_serial = 1;
+ mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
}
DEFINE_MACHINE("sim", xtensa_sim_machine_init)
--
2.13.6
- [Qemu-devel] [PULL 12/39] moxie: cleanup cpu type name composition, (continued)
- [Qemu-devel] [PULL 12/39] moxie: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 13/39] moxie: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 15/39] openrisc: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 14/39] openrisc: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 17/39] sh4: shix: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 16/39] sh4: r2d: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 18/39] sh4: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 19/39] sh4: simplify superh_cpu_class_by_name(), Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 20/39] sh4: remove SuperHCPUClass::name field, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 21/39] xtensa: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 22/39] xtensa: sim: use generic cpu_model parsing,
Eduardo Habkost <=
- [Qemu-devel] [PULL 23/39] xtensa: lx60/lx200/ml605/kc705: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 24/39] unicore32: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 25/39] unicore32: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 26/39] tricore: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 28/39] sparc: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 27/39] tricore: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 30/39] sparc: sparc: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 29/39] sparc: sun4u/sun4v/niagara: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 31/39] sparc: leon3: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 32/39] mips: use object_new() instead of gnew()+object_initialize(), Eduardo Habkost, 2017/10/26