[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/39] cris: use generic cpu_model parsing
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 04/39] cris: use generic cpu_model parsing |
Date: |
Thu, 26 Oct 2017 16:03:29 +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/cris/axis_dev88.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index 5eb552bce2..9ccc4350a5 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -251,7 +251,6 @@ static
void axisdev88_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;
const char *kernel_cmdline = machine->kernel_cmdline;
CRISCPU *cpu;
@@ -268,10 +267,7 @@ void axisdev88_init(MachineState *machine)
MemoryRegion *phys_intmem = g_new(MemoryRegion, 1);
/* init CPUs */
- if (cpu_model == NULL) {
- cpu_model = "crisv32";
- }
- cpu = CRIS_CPU(cpu_generic_init(TYPE_CRIS_CPU, cpu_model));
+ cpu = CRIS_CPU(cpu_create(machine->cpu_type));
env = &cpu->env;
/* allocate RAM */
@@ -359,6 +355,7 @@ static void axisdev88_machine_init(MachineClass *mc)
mc->desc = "AXIS devboard 88";
mc->init = axisdev88_init;
mc->is_default = 1;
+ mc->default_cpu_type = CRIS_CPU_TYPE_NAME("crisv32");
}
DEFINE_MACHINE("axis-dev88", axisdev88_machine_init)
--
2.13.6
- [Qemu-devel] [PULL 00/39] x86/cpu/numa queue, 2017-10-26, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 01/39] alpha: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 02/39] alpha: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 04/39] cris: use generic cpu_model parsing,
Eduardo Habkost <=
- [Qemu-devel] [PULL 03/39] cris: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 06/39] lm32: milkymist: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 05/39] lm32: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 07/39] lm32: lm32_boards: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 08/39] m68k: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 09/39] m68k: an5206: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 10/39] m68k: mcf5208: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 11/39] moxie: fix qemu-system-moxie failing to start with CLI "-cpu MoxieLite", Eduardo Habkost, 2017/10/26
- [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