[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 37/39] mips: r4k: replace cpu_model with cpu_type
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL v2 37/39] mips: r4k: replace cpu_model with cpu_type |
Date: |
Fri, 27 Oct 2017 16:21:05 +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/mips/mips_r4k.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index 1272d4ef9d..3bbb1827e1 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -163,7 +163,6 @@ static
void mips_r4k_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;
const char *initrd_filename = machine->initrd_filename;
@@ -186,14 +185,7 @@ void mips_r4k_init(MachineState *machine)
int be;
/* init CPUs */
- if (cpu_model == NULL) {
-#ifdef TARGET_MIPS64
- cpu_model = "R4000";
-#else
- cpu_model = "24Kf";
-#endif
- }
- cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, cpu_model));
+ cpu = MIPS_CPU(cpu_create(machine->cpu_type));
env = &cpu->env;
reset_info = g_malloc0(sizeof(ResetData));
@@ -303,6 +295,12 @@ static void mips_machine_init(MachineClass *mc)
mc->desc = "mips r4k platform";
mc->init = mips_r4k_init;
mc->block_default_type = IF_IDE;
+#ifdef TARGET_MIPS64
+ mc->default_cpu_type = MIPS_CPU_TYPE_NAME("R4000");
+#else
+ mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf");
+#endif
+
}
DEFINE_MACHINE("mips", mips_machine_init)
--
2.13.6
- [Qemu-devel] [PULL v2 26/39] tricore: cleanup cpu type name composition, (continued)
- [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, 2017/10/27
- [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 <=
- [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