[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 15/39] openrisc: use generic cpu_model parsing
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL v2 15/39] openrisc: use generic cpu_model parsing |
Date: |
Fri, 27 Oct 2017 16:20:43 +0200 |
From: Igor Mammedov <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Acked-by: Stafford Horne <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/openrisc/openrisc_sim.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index 58638c6ecd..e9558f1ca4 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -125,7 +125,6 @@ static void openrisc_load_kernel(ram_addr_t ram_size,
static void openrisc_sim_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;
OpenRISCCPU *cpu = NULL;
MemoryRegion *ram;
@@ -133,12 +132,8 @@ static void openrisc_sim_init(MachineState *machine)
qemu_irq serial_irq;
int n;
- if (!cpu_model) {
- cpu_model = "or1200";
- }
-
for (n = 0; n < smp_cpus; n++) {
- cpu = OPENRISC_CPU(cpu_generic_init(TYPE_OPENRISC_CPU, cpu_model));
+ cpu = OPENRISC_CPU(cpu_create(machine->cpu_type));
if (cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition!\n");
exit(1);
@@ -180,6 +175,7 @@ static void openrisc_sim_machine_init(MachineClass *mc)
mc->init = openrisc_sim_init;
mc->max_cpus = 2;
mc->is_default = 1;
+ mc->default_cpu_type = OPENRISC_CPU_TYPE_NAME("or1200");
}
DEFINE_MACHINE("or1k-sim", openrisc_sim_machine_init)
--
2.13.6
- [Qemu-devel] [PULL v2 05/39] lm32: cleanup cpu type name composition, (continued)
- [Qemu-devel] [PULL v2 05/39] lm32: cleanup cpu type name composition, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 06/39] lm32: milkymist: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 07/39] lm32: lm32_boards: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 08/39] m68k: cleanup cpu type name composition, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 09/39] m68k: an5206: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 10/39] m68k: mcf5208: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 11/39] moxie: fix qemu-system-moxie failing to start with CLI "-cpu MoxieLite", Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 12/39] moxie: cleanup cpu type name composition, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 13/39] moxie: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 14/39] openrisc: cleanup cpu type name composition, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 15/39] openrisc: use generic cpu_model parsing,
Eduardo Habkost <=
- [Qemu-devel] [PULL v2 16/39] sh4: r2d: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 17/39] sh4: shix: use generic cpu_model parsing, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 18/39] sh4: cleanup cpu type name composition, Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 19/39] sh4: simplify superh_cpu_class_by_name(), Eduardo Habkost, 2017/10/27
- [Qemu-devel] [PULL v2 20/39] sh4: remove SuperHCPUClass::name field, Eduardo Habkost, 2017/10/27
- [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