[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 36/38] mips: Magnum/Acer Pica 61: replace cpu_model
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 36/38] mips: Magnum/Acer Pica 61: replace cpu_model with cpu_type |
Date: |
Mon, 2 Oct 2017 11:08:18 +0200 |
Signed-off-by: Igor Mammedov <address@hidden>
---
CC: address@hidden
CC: address@hidden
CC: address@hidden
---
hw/mips/mips_jazz.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index 7e6626d..fe4f173 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -122,7 +122,6 @@ static void mips_jazz_init(MachineState *machine,
enum jazz_model_e jazz_model)
{
MemoryRegion *address_space = get_system_memory();
- const char *cpu_model = machine->cpu_model;
char *filename;
int bios_size, n;
MIPSCPU *cpu;
@@ -148,10 +147,7 @@ static void mips_jazz_init(MachineState *machine,
MemoryRegion *bios2 = g_new(MemoryRegion, 1);
/* init CPUs */
- if (cpu_model == NULL) {
- cpu_model = "R4000";
- }
- cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, cpu_model));
+ cpu = MIPS_CPU(cpu_create(machine->cpu_type));
env = &cpu->env;
qemu_register_reset(main_cpu_reset, cpu);
@@ -349,6 +345,7 @@ static void mips_magnum_class_init(ObjectClass *oc, void
*data)
mc->desc = "MIPS Magnum";
mc->init = mips_magnum_init;
mc->block_default_type = IF_SCSI;
+ mc->default_cpu_type = MIPS_CPU_TYPE_NAME("R4000");
}
static const TypeInfo mips_magnum_type = {
@@ -364,6 +361,7 @@ static void mips_pica61_class_init(ObjectClass *oc, void
*data)
mc->desc = "Acer Pica 61";
mc->init = mips_pica61_init;
mc->block_default_type = IF_SCSI;
+ mc->default_cpu_type = MIPS_CPU_TYPE_NAME("R4000");
}
static const TypeInfo mips_pica61_type = {
--
2.7.4
- [Qemu-devel] [PATCH 25/38] unicore32: cleanup cpu type name composition, (continued)
- [Qemu-devel] [PATCH 25/38] unicore32: cleanup cpu type name composition, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 30/38] sparc: sun4u/sun4v/niagara: use generic cpu_model parsing, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 31/38] sparc: sparc: use generic cpu_model parsing, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 32/38] sparc: leon3: use generic cpu_model parsing, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 34/38] mips: malta/boston: replace cpu_model with cpu_type, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 36/38] mips: Magnum/Acer Pica 61: replace cpu_model with cpu_type,
Igor Mammedov <=
- [Qemu-devel] [PATCH 33/38] mips: use object_new() instead of gnew()+object_initialize(), Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 37/38] mips: mipssim: replace cpu_model with cpu_type, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 35/38] mips: fulong2e: replace cpu_model with cpu_type, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 38/38] mips: r4k: replace cpu_model with cpu_type, Igor Mammedov, 2017/10/02